From da160d020ee2c2911a0d2ad2fd1074e8971db0ad Mon Sep 17 00:00:00 2001 From: Alexander Barton Date: Fri, 27 Jun 2008 05:55:45 +0200 Subject: [PATCH] autogen.sh: Don't set AUTO{CONF|MAKE}_VERSION and WANT_AUTO{CONF|MAKE} On some systems (for example Gentoo Linux, FreeBSD, and OpenBSD), these variables are used to select which version of GNU automake and autoconf to use, but we shouldn't depend on a specific version -- instead we should use the "system default". So probably it is up to the user to set these variables accordingly to set up some wrapper scripts of his operating system distribution. --- autogen.sh | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/autogen.sh b/autogen.sh index 0f1458c5..bd438cd5 100755 --- a/autogen.sh +++ b/autogen.sh @@ -121,20 +121,6 @@ if [ -z "$EXIST" ]; then fi [ "$VERBOSE" = "1" ] && echo "Using \"$EXIST\" to test for tools." -# 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. -- 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 # specifies one: echo "Searching tools ..."