scripts/autogen.sh fix

[Simon Josefsson]

How about this?

Index: scripts/autogen.sh
===================================================================
RCS file: /cvs/gnupg/gnupg/scripts/autogen.sh,v
retrieving revision 1.13
diff -u -p -r1.13 autogen.sh
--- scripts/autogen.sh	29 Jun 2002 13:37:55 -0000	1.13
+++ scripts/autogen.sh	7 Jul 2002 01:12:11 -0000
@@ -12,6 +12,10 @@
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 PGM=GnuPG
+ACLOCAL=${ACLOCAL:-aclocal}
+AUTOCONF=${AUTOCONF:-autoconf}
+AUTOMAKE=${AUTOMAKE:-automake}
+AUTOHEADER=${AUTOHEADER:-autoheader}
 lib_config_files=""
 autoconf_vers=2.52
 automake_vers=1.5
@@ -72,46 +76,46 @@ fi
 
 
 
-if (autoconf --version) < /dev/null > /dev/null 2>&1 ; then
-    if (autoconf --version | awk 'NR==1 { if( $3 >= '$autoconf_vers') \
+if ($AUTOCONF --version) < /dev/null > /dev/null 2>&1 ; then
+    if ($AUTOCONF --version | awk 'NR==1 { if( $3 >= '$autoconf_vers') \
 			       exit 1; exit 0; }');
     then
-       echo "**Error**: "\`autoconf\'" is too old."
+       echo "**Error**: "\`$AUTOCONF\'" is too old."
        echo '           (version ' $autoconf_vers ' or newer is required)'
        DIE="yes"
     fi
 else
     echo
-    echo "**Error**: You must have "\`autoconf\'" installed to compile $PGM."
+    echo "**Error**: You must have "\`$AUTOCONF\'" installed to compile $PGM."
     echo '           (version ' $autoconf_vers ' or newer is required)'
     DIE="yes"
 fi
 
-if (automake --version) < /dev/null > /dev/null 2>&1 ; then
-  if (automake --version | awk 'NR==1 { if( $4 >= '$automake_vers') \
+if ($AUTOMAKE --version) < /dev/null > /dev/null 2>&1 ; then
+  if ($AUTOMAKE --version | awk 'NR==1 { if( $4 >= '$automake_vers') \
 			     exit 1; exit 0; }');
      then
-     echo "**Error**: "\`automake\'" is too old."
+     echo "**Error**: "\`$AUTOMAKE\'" is too old."
      echo '           (version ' $automake_vers ' or newer is required)'
      DIE="yes"
   fi
-  if (aclocal --version) < /dev/null > /dev/null 2>&1; then
-    if (aclocal --version | awk 'NR==1 { if( $4 >= '$aclocal_vers' ) \
+  if ($ACLOCAL --version) < /dev/null > /dev/null 2>&1; then
+    if ($ACLOCAL --version | awk 'NR==1 { if( $4 >= '$aclocal_vers' ) \
 						exit 1; exit 0; }' );
     then
-      echo "**Error**: "\`aclocal\'" is too old."
+      echo "**Error**: "\`$ACLOCAL\'" is too old."
       echo '           (version ' $aclocal_vers ' or newer is required)'
       DIE="yes"
     fi
   else
     echo
-    echo "**Error**: Missing "\`aclocal\'".  The version of "\`automake\'
+    echo "**Error**: Missing "\`$ACLOCAL\'".  The version of "\`$AUTOMAKE\'
     echo "           installed doesn't appear recent enough."
     DIE="yes"
   fi
 else
     echo
-    echo "**Error**: You must have "\`automake\'" installed to compile $PGM."
+    echo "**Error**: You must have "\`$AUTOMAKE\'" installed to compile $PGM."
     echo '           (version ' $automake_vers ' or newer is required)'
     DIE="yes"
 fi
@@ -135,14 +139,14 @@ fi
 echo "Running gettextize...  Ignore non-fatal messages."
 echo "no" | gettextize --force
 
-echo "Running aclocal..."
-aclocal
-echo "Running autoheader..."
-autoheader
-echo "Running automake --gnu ..."
-automake --gnu;
-echo "Running autoconf..."
-autoconf
+echo "Running $ACLOCAL..."
+$ACLOCAL
+echo "Running $AUTOHEADER..."
+$AUTOHEADER
+echo "Running $AUTOMAKE --gnu ..."
+$AUTOMAKE --gnu;
+echo "Running $AUTOCONF..."
+$AUTOCONF
 
 echo "You can now run \"./configure\" and then \"make\"."