better method of locating autoconf and autoheader; patch by Willi Mann

(This used to be commit 521ab105b2fb240c6e97b3e3d50a9e1590d14931)

1 files changed, 40 insertions, 16 deletions

diff --git a/source3/autogen.sh b/source3/autogen.sh
index a2228a6fd9..869f1d2f5e 100755
--- a/source3/autogen.sh
+++ b/source3/autogen.sh
@@ -2,30 +2,53 @@
 
 # Run this script to build samba from CVS.
 
-## first try the default names
-AUTOHEADER="autoheader"
-AUTOCONF="autoconf"
-
-if which $AUTOCONF > /dev/null
-then
-    :
-else
-    echo "$0: need autoconf 2.53 or later to build samba from CVS" >&2
-    exit 1
-fi
+## insert all possible names (only works with 
+## autoconf 2.x
+TESTAUTOHEADER="autoheader autoheader-2.53"
+TESTAUTOCONF="autoconf autoconf-2.53"
+
+AUTOHEADERFOUND="0"
+AUTOCONFFOUND="0"
 
+
+##
+## Look for autoheader 
 ##
-## what version do we need?
+for i in $TESTAUTOHEADER; do
+	if which $i >& /dev/null; then
+		if [ `$i --version | head -1 | cut -d.  -f 2` -ge 53 ]; then
+			AUTOHEADER=$i
+			AUTOHEADERFOUND="1"
+			break
+		fi
+	fi
+done
+
+## 
+## Look for autoconf
 ##
-if [ `$AUTOCONF --version | head -1 | cut -d.  -f 2` -lt 53 ]; then
 
-	## maybe it's installed under a different name (e.g. RedHat 7.3)
+for i in $TESTAUTOCONF; do
+	if which $i >& /dev/null; then
+		if [ `$i --version | head -1 | cut -d.  -f 2` -ge 53 ]; then
+			AUTOCONF=$i
+			AUTOCONFFOUND="1"
+			break
+		fi
+	fi
+done
 
-	AUTOCONF="autoconf-2.53"
-	AUTOHEADER="autoheader-2.53"
 
+## 
+## do we have it?
+##
+if [ "$AUTOCONFFOUND" == "0" -o "$AUTOHEADERFOUND" == "0" ]; then
+	echo "$0: need autoconf 2.53 or later to build samba from CVS" >&2
+	exit 1
 fi
 
+
+
 echo "$0: running $AUTOHEADER"
 $AUTOHEADER || exit 1
 
@@ -34,3 +57,4 @@ $AUTOCONF || exit 1
 
 echo "Now run ./configure and then make."
 exit 0
+