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"

diff --git a/ChangeLog b/ChangeLog
index 6f6b43e..f6d9277 100644 (file)
--- a/ChangeLog
+++ b/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"
+
 Wed Aug 14 18:54:19 CEST 2002 Daniel Veillard <daniel@veillard.com>
 
        * configure.in python/Makefile.am: AMD x86-64 induced changes from

diff --git a/autogen.sh b/autogen.sh
index c39f5cc..5548f69 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -24,7 +24,7 @@ DIE=0
        DIE=1
 }
 
-(automake --version) < /dev/null > /dev/null 2>&1 || {
+(automake-1.4 --version) < /dev/null > /dev/null 2>&1 || {
        echo
        echo "You must have automake installed to compile gnome-xml."
        echo "Get ftp://ftp.cygnus.com/pub/home/tromey/automake-1.2d.tar.gz"
@@ -49,9 +49,9 @@ fi
 echo "Running libtoolize..."
 libtoolize --copy --force
 echo "Running aclocal..."
-aclocal $ACLOCAL_FLAGS
+aclocal-1.4 $ACLOCAL_FLAGS
 echo "Running automake..."
-automake --add-missing
+automake-1.4 --add-missing
 echo "Running autoconf..."
 autoconf