X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=autogen.sh;h=dfb1622da959be2f9aa59ac1c0dd28e46b77c659;hp=19b81af66fa7ae1cd24e18fa28ad2c0496b61f9e;hb=2f6d7a649cf2428991cba3b9d2250b95a5904675;hpb=0b1202cd9ec34eb2584de475b4ec47c3f541fd50

diff --git a/autogen.sh b/autogen.sh
index 19b81af6..dfb1622d 100755
--- a/autogen.sh
+++ b/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.11 2004/03/19 11:47:51 alex Exp $
+# $Id: autogen.sh,v 1.15 2007/10/07 13:02:15 alex Exp $
 #
 
 #
@@ -31,11 +31,14 @@
 #
 # You can tweak the behaviour using these environment variables:
 #
-# - ALICA=<cmd>, AUTOHEADER=<cmd>, AUTOMAKE=<cmd>, AUTOCONF=<cmd>
+# - ACLOCAL=<cmd>, AUTOHEADER=<cmd>, AUTOMAKE=<cmd>, AUTOCONF=<cmd>
 #   Name and optionally path to the particular tool.
 # - PREFIX=<path>
 #   Search the GNU autoconf and GNU automake tools in <path> first. If the
 #   generated ./configure script will be called, pass "--prefix=<path>" to it.
+# - EXIST=<tool>
+#   Use <tool> to test for aclocal, autoheader etc. pp. ...
+#   When not specified, either "type" or "which" is used.
 # - VERBOSE=1
 #   Output the detected names of the GNU automake and GNU autoconf tools.
 # - GO=1
@@ -63,13 +66,10 @@ Search()
 	major="$2"
 	minor=99
 
-	which /bin/ls >/dev/null 2>&1
-	[ $? -eq 0 ] && exists="which" || exists="type"
-
 	[ -n "$PREFIX" ] && searchlist="${PREFIX}/$1 ${PREFIX}/bin/$1 $searchlist"
 
 	for name in $searchlist; do
-		$exists "${name}" >/dev/null 2>&1
+		$EXIST "${name}" >/dev/null 2>&1
 		if [ $? -eq 0 ]; then
 			echo "${name}"
 			return 0
@@ -78,14 +78,14 @@ Search()
 
 	while [ $minor -ge 0 ]; do
 		for name in $searchlist; do
-			$exists "${name}${major}${minor}" >/dev/null 2>&1
+			$EXIST "${name}${major}${minor}" >/dev/null 2>&1
 			if [ $? -eq 0 ]; then
 				echo "${name}${major}${minor}"
 				return 0
 			fi
-			$exists "${name}-${major}.${minor}" >/dev/null 2>&1
+			$EXIST "${name}-${major}.${minor}" >/dev/null 2>&1
 			if [ $? -eq 0 ]; then
-				echo "${name}-${major}.${minor}" >/dev/null 2>&1
+				echo "${name}-${major}.${minor}"
 				return 0
 			fi
 		done
@@ -105,13 +105,41 @@ Notfound()
 unset LC_ALL
 unset LANG
 
-# We want to use GNU automake 1.7, if available (WANT_AUTOMAKE is used by
-# the wrapper scripts of Gentoo Linux):
-WANT_AUTOMAKE=1.7
-export WANT_AUTOMAKE
+# Which command should be used to detect the automake/autoconf tools?
+[ -z "$EXIST" ] && existlist="type which" || existlist="$EXIST"
+EXIST=""
+for t in $existlist; do
+	$t /bin/ls >/dev/null 2>&1
+	if [ $? -eq 0 ]; then
+		rm -f /tmp/test.$$
+		$t /tmp/test.$$ >/dev/null 2>&1
+		[ $? -ne 0 ] && EXIST="$t"
+	fi
+	[ -n "$EXIST" ] && break
+done
+if [ -z "$EXIST" ]; then
+	echo "Didn't detect a working command to test for the autoconf/automake tools!"
+	echo "Searchlist: $existlist"
+	exit 1
+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
-# spezifies one:
+# specifies one:
 echo "Searching tools ..."
 [ -z "$ACLOCAL" ] && ACLOCAL=`Search aclocal 1`
 [ "$VERBOSE" = "1" ] && echo "ACLOCAL=$ACLOCAL"
@@ -127,7 +155,7 @@ echo "Searching tools ..."
 [ -z "$GO" -a $# -gt 0 ] && GO=1
 
 # Verify that all tools have been found
-[ -z "$AUTOCONF" ] && Notfounf autoconf
+[ -z "$AUTOCONF" ] && Notfound autoconf
 [ -z "$AUTOHEADER" ] && Notfound autoheader
 [ -z "$AUTOMAKE" ] && Notfound automake
 [ -z "$AUTOCONF" ] && Notfound autoconf