Updated preferred automake version to 1.9. Only set preferences if not

already defined by some environment variables.
This commit is contained in:
Alexander Barton 2007-10-07 13:02:15 +00:00
parent f586052f2b
commit 77939c382d
1 changed files with 14 additions and 9 deletions

View File

@ -9,7 +9,7 @@
# (at your option) any later version. # (at your option) any later version.
# Please read the file COPYING, README and AUTHORS for more information. # 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 fi
[ "$VERBOSE" = "1" ] && echo "Using \"$EXIST\" to test for tools." [ "$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); # the wrapper scripts of Gentoo Linux, AUTOMAKE_VERSION is used by OpenBSD);
# same applies for GNU autoconf, we want to use version 2.59. # same applies for GNU autoconf, we want to use version 2.59. -- But only
AUTOMAKE_VERSION=1.7 # set these preferences if not already set!
AUTOCONF_VERSION=2.59 if [ -z "$AUTOMAKE_VERSION" -a -z "$WANT_AUTOMAKE" ]; then
export AUTOMAKE_VERSION AUTOCONF_VERSION AUTOMAKE_VERSION=1.9
WANT_AUTOMAKE=1.7 WANT_AUTOMAKE=1.9
export WANT_AUTOMAKE 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 # Try to detect the needed tools when no environment variable already
# spezifies one: # specifies one:
echo "Searching tools ..." echo "Searching tools ..."
[ -z "$ACLOCAL" ] && ACLOCAL=`Search aclocal 1` [ -z "$ACLOCAL" ] && ACLOCAL=`Search aclocal 1`
[ "$VERBOSE" = "1" ] && echo "ACLOCAL=$ACLOCAL" [ "$VERBOSE" = "1" ] && echo "ACLOCAL=$ACLOCAL"