X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?p=ngircd-alex.git;a=blobdiff_plain;f=autogen.sh;h=78eb9f49b78ddda709bfc966130064cea241fe31;hp=a78b4f278720cb80d4ee00b9a5a93493ad6ba85f;hb=77f54693ef258b1fe65ee105fc026dfb2c6257dc;hpb=8212662d9d265657039a8e1554237d70b3fb6e1c

diff --git a/autogen.sh b/autogen.sh
index a78b4f27..78eb9f49 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.10 2004/03/15 20:32:31 alex Exp $
+# $Id: autogen.sh,v 1.14 2005/02/21 15:23:23 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,10 +66,10 @@ Search()
 	major="$2"
 	minor=99
 
-	[ -n "$PREFIX" ] && searchlist="${PREFIX}$1 ${PREFIX}/bin/$1 $searchlist"
+	[ -n "$PREFIX" ] && searchlist="${PREFIX}/$1 ${PREFIX}/bin/$1 $searchlist"
 
 	for name in $searchlist; do
-		type "${name}" >/dev/null 2>&1
+		$EXIST "${name}" >/dev/null 2>&1
 		if [ $? -eq 0 ]; then
 			echo "${name}"
 			return 0
@@ -75,14 +78,14 @@ Search()
 
 	while [ $minor -ge 0 ]; do
 		for name in $searchlist; do
-			type "${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
-			type "${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
@@ -102,8 +105,31 @@ Notfound()
 unset LC_ALL
 unset LANG
 
+# 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.7, if available (WANT_AUTOMAKE is used by
-# the wrapper scripts of Gentoo Linux):
+# 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
 
@@ -111,20 +137,20 @@ export WANT_AUTOMAKE
 # spezifies one:
 echo "Searching tools ..."
 [ -z "$ACLOCAL" ] && ACLOCAL=`Search aclocal 1`
+[ "$VERBOSE" = "1" ] && echo "ACLOCAL=$ACLOCAL"
 [ -z "$AUTOHEADER" ] && AUTOHEADER=`Search autoheader 2`
+[ "$VERBOSE" = "1" ] && echo "AUTOHEADER=$AUTOHEADER"
 [ -z "$AUTOMAKE" ] && AUTOMAKE=`Search automake 1`
+[ "$VERBOSE" = "1" ] && echo "AUTOMAKE=$AUTOMAKE"
 [ -z "$AUTOCONF" ] && AUTOCONF=`Search autoconf 2`
+[ "$VERBOSE" = "1" ] && echo "AUTOCONF=$AUTOCONF"
 
-# Some debugging output ...
-if [ -n "$VERBOSE" ]; then
-	echo "ACLOCAL=$ACLOCAL"
-	echo "AUTOHEADER=$AUTOHEADER"
-	echo "AUTOMAKE=$AUTOMAKE"
-	echo "AUTOCONF=$AUTOCONF"
-fi
+# Call ./configure when parameters have been passed to this script and
+# GO isn't already defined.
+[ -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
@@ -141,7 +167,7 @@ $ACLOCAL && \
 if [ $? -eq 0 -a -x ./configure ]; then
 	# Success: if we got some parameters we call ./configure and pass
 	# all of them to it.
-	if [ -n "$*" -o -n "$GO" ]; then
+	if [ "$GO" = "1" ]; then
 		[ -n "$PREFIX" ] && p=" --prefix=$PREFIX" || p=""
 		[ -n "$*" ] && a=" $*" || a=""
 		c="./configure${p}${a}"