X-Git-Url: https://arthur.barton.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=autogen.sh;h=dfb1622da959be2f9aa59ac1c0dd28e46b77c659;hb=cb0d594e6184694f8563f1e3116e3aac34606a86;hp=b67eb77b1cead0c447a9f88ed72f617346815b96;hpb=f68e92eb9a4dcc6a09677dac4d0cc4524c17148b;p=ngircd-alex.git

diff --git a/autogen.sh b/autogen.sh
index b67eb77b..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.12 2004/04/05 12:02:21 alex Exp $
+# $Id: autogen.sh,v 1.15 2007/10/07 13:02:15 alex Exp $
 #
 
 #
@@ -85,7 +85,7 @@ Search()
 			fi
 			$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
@@ -124,13 +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
-# the wrapper scripts of Gentoo Linux):
-WANT_AUTOMAKE=1.7
-export WANT_AUTOMAKE
+# 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"