Complete intltool support.

	* autogen.sh: Complete intltool support.

svn path=/trunk/; revision=2013

diff --git a/macros/ChangeLog b/macros/ChangeLog
index 84a4bd2..47ee610 100644 (file)
--- a/macros/ChangeLog
+++ b/macros/ChangeLog
@@ -1,5 +1,9 @@
 2001-10-02  Darin Adler  <darin@bentspoon.com>
 
+       * autogen.sh: Complete intltool support.
+
+2001-10-02  Darin Adler  <darin@bentspoon.com>
+
        * autogen.sh: Add intltool support.
 
 2001-09-16  Eskil Heyn Olsen  <eskil@eskil.dk>

diff --git a/macros/autogen.sh b/macros/autogen.sh
index ebc4768..71f7dfc 100644 (file)
--- a/macros/autogen.sh
+++ b/macros/autogen.sh
@@ -17,7 +17,7 @@ fi
   DIE=1
 }
 
-(grep "^AM_PROG_INTLTOOL" $srcdir/configure.in >/dev/null) && {
+(grep "^AC_PROG_INTLTOOL" $srcdir/configure.in >/dev/null) && {
   (intltoolize --version) < /dev/null > /dev/null 2>&1 || {
     echo 
     echo "**Error**: You must have \`intltoolize' installed to compile $PKG_NAME."
@@ -158,8 +158,12 @@ do
        echo "Making $dr/aclocal.m4 writable ..."
        test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4
       fi
+      if grep "^AC_PROG_INTLTOOL" configure.in >/dev/null; then
+        echo "Running intltoolize..."
+       intltoolize --copy --force --automake
+      fi
       if grep "^AM_PROG_XML_I18N_TOOLS" configure.in >/dev/null; then
-        echo "Running xml-i18n-toolize... Ignore non-fatal messages."
+        echo "Running xml-i18n-toolize..."
        xml-i18n-toolize --copy --force --automake
       fi
       if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then

diff --git a/macros2/ChangeLog b/macros2/ChangeLog
index 6dae5a8..73ab603 100644 (file)
--- a/macros2/ChangeLog
+++ b/macros2/ChangeLog
@@ -1,5 +1,9 @@
 2001-10-02  Darin Adler  <darin@bentspoon.com>
 
+       * autogen.sh: Complete intltool support.
+
+2001-10-02  Darin Adler  <darin@bentspoon.com>
+
        * autogen.sh: Add intltool support.
 
 2001-09-04  Frank Belew  <frb@ximian.com>

diff --git a/macros2/autogen.sh b/macros2/autogen.sh
index 6a14054..0d9d3bf 100644 (file)
--- a/macros2/autogen.sh
+++ b/macros2/autogen.sh
@@ -19,7 +19,7 @@ fi
   DIE=1
 }
 
-(grep "^AM_PROG_INTLTOOL" $srcdir/configure.in >/dev/null) && {
+(grep "^AC_PROG_INTLTOOL" $srcdir/configure.in >/dev/null) && {
   (intltoolize --version) < /dev/null > /dev/null 2>&1 || {
     echo
     echo "**Error**: You must have \`intltoolize' installed to compile $PKG_NAME."
@@ -118,6 +118,10 @@ do
          test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4
         fi
       fi
+      if grep "^AC_PROG_INTLTOOL" configure.in >/dev/null; then
+        echo "Running intltoolize..."
+       intltoolize --copy --force --automake
+      fi
       if grep "^AM_PROG_XML_I18N_TOOLS" configure.in >/dev/null; then
         echo "Running xml-i18n-toolize..."
        xml-i18n-toolize --copy --force --automake