[blam] autogen.sh: use the $CONFIGURE variable for "configure.in" occurrences



commit 7dcc6f20d27d7656511ecefdb4c59f9e8735c2e2
Author: Andrés G. Aragoneses <knocte gmail com>
Date:   Fri Jun 14 08:54:59 2013 +0200

    autogen.sh: use the $CONFIGURE variable for "configure.in" occurrences
    
    There is already a $CONFIGURE variable set to "configure.in", which we
    can reuse in some places. This will come in handy in the near future
    when we rename configure.in to configure.ac (because it's giving a
    warning about this now).

 autogen.sh |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/autogen.sh b/autogen.sh
index ccc5f97..fd89f11 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -76,7 +76,7 @@ fi
        DIE=1
 }
 
-(grep "^AC_PROG_INTLTOOL" $srcdir/configure.in >/dev/null) && {
+(grep "^AC_PROG_INTLTOOL" $srcdir/$CONFIGURE >/dev/null) && {
   ($INTLTOOLIZE --version) < /dev/null > /dev/null 2>&1 || {
     echo
     echo "You must have \`intltoolize' installed to compile $PROJECT."
@@ -86,7 +86,7 @@ fi
   }
 }
 
-(grep "^AM_PROG_LIBTOOL" configure.in >/dev/null) && {
+(grep "^AM_PROG_LIBTOOL" $CONFIGURE >/dev/null) && {
   ($LIBTOOL --version) < /dev/null > /dev/null 2>&1 || {
     echo
     echo "**Error**: You must have \`libtool' installed to compile $PROJECT."
@@ -154,8 +154,8 @@ do
        ##  echo "**Warning**: No such directory \`$k'.  Ignored."
         fi
       done
-      if grep "^AM_GLIB_GNU_GETTEXT" configure.in >/dev/null; then
-       if grep "sed.*POTFILES" configure.in >/dev/null; then
+      if grep "^AM_GLIB_GNU_GETTEXT" $CONFIGURE >/dev/null; then
+       if grep "sed.*POTFILES" $CONFIGURE >/dev/null; then
          : do nothing -- we still have an old unmodified configure.in
        else
          echo "Creating $dr/aclocal.m4 ..."
@@ -166,17 +166,17 @@ do
          test -r $dr/aclocal.m4 && chmod u+w $dr/aclocal.m4
         fi
       fi
-      if grep "^AC_PROG_INTLTOOL" configure.in >/dev/null; then
+      if grep "^AC_PROG_INTLTOOL" $CONFIGURE >/dev/null; then
         echo "Running intltoolize..."
        intltoolize --copy --force --automake
       fi
-      if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then
+      if grep "^AM_PROG_LIBTOOL" $CONFIGURE >/dev/null; then
        echo "Running $LIBTOOLIZE..."
        $LIBTOOLIZE --force --copy
       fi
       echo "Running $ACLOCAL $aclocalinclude ..."
       $ACLOCAL $aclocalinclude
-      if grep "^AM_CONFIG_HEADER" configure.in >/dev/null; then
+      if grep "^AM_CONFIG_HEADER" $CONFIGURE >/dev/null; then
        echo "Running $AUTOHEADER..."
        $AUTOHEADER
       fi


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]