Merge branch 'interpolation'

[andy/viking.git] / autogen.sh

diff --git a/autogen.sh b/autogen.sh
index cfdbb3b294a9cfc52482c24cd935b6f2e5cae1db..8e0be2c63bd880856b486be1cdef5a81c387557b 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -31,7 +31,7 @@ DIE=0
        DIE=1
 }
 
-(grep "^AC_PROG_INTLTOOL" $srcdir/$CONFIGURE >/dev/null) && {
+(grep "^IT_PROG_INTLTOOL" $srcdir/$CONFIGURE >/dev/null) && {
   ($INTLTOOLIZE --version) < /dev/null > /dev/null 2>&1 || {
     echo
     echo "You must have \`intltoolize' installed to compile $PROJECT."
@@ -131,8 +131,8 @@ do
       fi
       if grep "^AC_PROG_INTLTOOL" $CONFIGURE >/dev/null ||
          grep "^IT_PROG_INTLTOOL" $CONFIGURE >/dev/null; then
-        echo "Running intltoolize..."
-       intltoolize --copy --force --automake
+        echo "Running $INTLTOOLIZE..."
+       $INTLTOOLIZE --copy --force --automake
       fi
       if grep "^AM_PROG_LIBTOOL" $CONFIGURE >/dev/null; then
        echo "Running $LIBTOOLIZE..."
@@ -140,7 +140,7 @@ do
       fi
       echo "Running $ACLOCAL $aclocalinclude ..."
       $ACLOCAL $aclocalinclude
-      if grep "^AM_CONFIG_HEADER" $CONFIGURE >/dev/null; then
+      if grep "^A[CM]_CONFIG_HEADER" $CONFIGURE >/dev/null; then
        echo "Running $AUTOHEADER..."
        $AUTOHEADER
       fi