Commit Diff
Diff:
f586052f2b6800ecd9bb9d75fa5e3f4028da809d
77939c382d84cf1ab1fcf6d78c955b1464ea21ac
77939c382d84cf1ab1fcf6d78c955b1464ea21ac
Commit:
77939c382d84cf1ab1fcf6d78c955b1464ea21ac
Tree:
6dc4d64f86301f1ed47f88afe31ead0ca077568b
Committer:
Alexander Barton <alex@barton.de>
Date:
Sun Oct 7 13:02:15 2007
UTC
Message:
Updated preferred automake version to 1.9. Only set preferences if not
already defined by some environment variables.
--- autogen.sh
+++ autogen.sh
@@ -9,7 +9,7 @@
# (at your option) any later version.
# Please read the file COPYING, README and AUTHORS for more information.
#
-# $Id: autogen.sh,v 1.14 2005/02/21 15:23:23 alex Exp $
+# $Id: autogen.sh,v 1.15 2007/10/07 13:02:15 alex Exp $
#
#
@@ -124,17 +124,22 @@ if [ -z "$EXIST" ]; then
fi
[ "$VERBOSE" = "1" ] && echo "Using \"$EXIST\" to test for tools."
-# We want to use GNU automake 1.7, if available (WANT_AUTOMAKE is used by
+# We want to use GNU automake 1.9, if available (WANT_AUTOMAKE is used by
# the wrapper scripts of Gentoo Linux, AUTOMAKE_VERSION is used by OpenBSD);
-# same applies for GNU autoconf, we want to use version 2.59.
-AUTOMAKE_VERSION=1.7
-AUTOCONF_VERSION=2.59
-export AUTOMAKE_VERSION AUTOCONF_VERSION
-WANT_AUTOMAKE=1.7
-export WANT_AUTOMAKE
+# same applies for GNU autoconf, we want to use version 2.59. -- But only
+# set these preferences if not already set!
+if [ -z "$AUTOMAKE_VERSION" -a -z "$WANT_AUTOMAKE" ]; then
+ AUTOMAKE_VERSION=1.9
+ WANT_AUTOMAKE=1.9
+fi
+if [ -z "$AUTOCONF_VERSION" -a -z "$WANT_AUTOCONF" ]; then
+ AUTOCONF_VERSION=2.59
+ WANT_AUTOCONF=2.59
+fi
+export AUTOMAKE_VERSION WANT_AUTOMAKE AUTOCONF_VERSION WANT_AUTOCONF
# Try to detect the needed tools when no environment variable already
-# spezifies one:
+# specifies one:
echo "Searching tools ..."
[ -z "$ACLOCAL" ] && ACLOCAL=`Search aclocal 1`
[ "$VERBOSE" = "1" ] && echo "ACLOCAL=$ACLOCAL"