hardcode aclocal-1.4/automake-1.4 so that users with both automake 1.6 and

2002-08-18  Havoc Pennington  <hp@pobox.com>

	* autogen.sh: hardcode aclocal-1.4/automake-1.4 so that users with
	both automake 1.6 and 1.4 installed get the right automake. Means
	compilation from CVS will now require the latest automake 1.4
	release, or manually creating symlinks called "automake-1.4" and
	"aclocal-1.4"

svn path=/trunk/; revision=2565

diff --git a/macros2/ChangeLog b/macros2/ChangeLog
index 9654094..7c72188 100644 (file)
--- a/macros2/ChangeLog
+++ b/macros2/ChangeLog
@@ -1,3 +1,11 @@
+2002-08-18  Havoc Pennington  <hp@pobox.com>
+
+       * autogen.sh: hardcode aclocal-1.4/automake-1.4 so that users with
+       both automake 1.6 and 1.4 installed get the right automake. Means
+       compilation from CVS will now require the latest automake 1.4
+       release, or manually creating symlinks called "automake-1.4" and
+       "aclocal-1.4"
+
 Mon Aug 12 23:49:41 2002  HideToshi Tajima  <hidetoshi.tajima@sun.com>
 
        * autogen.sh : use portable -o instead of GNU-ish -or for find test

diff --git a/macros2/autogen.sh b/macros2/autogen.sh
index 6c2258c..7be40a7 100644 (file)
--- a/macros2/autogen.sh
+++ b/macros2/autogen.sh
@@ -81,7 +81,7 @@ if grep "^AM_[A-Z0-9_]\{1,\}_GETTEXT" "$CONFIGURE" >/dev/null; then
   fi
 fi
 
-(automake --version) < /dev/null > /dev/null 2>&1 || {
+(automake-1.4 --version) < /dev/null > /dev/null 2>&1 || {
   echo
   echo "**Error**: You must have \`automake' installed to compile $PKG_NAME."
   echo "Get ftp://ftp.gnu.org/pub/gnu/automake-1.3.tar.gz"
@@ -92,7 +92,7 @@ fi
 
 
 # if no automake, don't bother testing for aclocal
-test -n "$NO_AUTOMAKE" || (aclocal --version) < /dev/null > /dev/null 2>&1 || {
+test -n "$NO_AUTOMAKE" || (aclocal-1.4 --version) < /dev/null > /dev/null 2>&1 || {
   echo
   echo "**Error**: Missing \`aclocal'.  The version of \`automake'"
   echo "installed doesn't appear recent enough."
@@ -151,14 +151,15 @@ do
          libtoolize --force --copy
        fi
       fi
+
       echo "Running aclocal $aclocalinclude ..."
-      aclocal $aclocalinclude
+      aclocal-1.4 $aclocalinclude
       if grep "^AM_CONFIG_HEADER" $bn >/dev/null; then
        echo "Running autoheader..."
        autoheader
       fi
       echo "Running automake --gnu $am_opt ..."
-      automake --add-missing --gnu $am_opt
+      automake-1.4 --add-missing --gnu $am_opt
       echo "Running autoconf ..."
       autoconf
     )