From 4475d471796e505c4b56814615edf58536b1b7cb Mon Sep 17 00:00:00 2001
From: Gerald Carter <jerry@samba.org>
Date: Fri, 4 Apr 2003 00:14:02 +0000
Subject: [PATCH] better method of locating autoconf and autoheader; patch by
 Willi Mann

---
 source/autogen.sh | 96 ++++++++++++++++++++++++++++++++++---------------------
 1 file changed, 60 insertions(+), 36 deletions(-)
 rewrite source/autogen.sh (65%)

diff --git a/source/autogen.sh b/source/autogen.sh
dissimilarity index 65%
index a2228a6fd92..869f1d2f5e5 100755
--- a/source/autogen.sh
+++ b/source/autogen.sh
@@ -1,36 +1,60 @@
-#! /bin/sh
-
-# 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
-
-##
-## what version do we need?
-##
-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)
-
-	AUTOCONF="autoconf-2.53"
-	AUTOHEADER="autoheader-2.53"
-
-fi
-
-echo "$0: running $AUTOHEADER"
-$AUTOHEADER || exit 1
-
-echo "$0: running $AUTOCONF"
-$AUTOCONF || exit 1
-
-echo "Now run ./configure and then make."
-exit 0
+#! /bin/sh
+
+# Run this script to build samba from CVS.
+
+## 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 
+##
+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
+##
+
+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
+
+
+## 
+## 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
+
+echo "$0: running $AUTOCONF"
+$AUTOCONF || exit 1
+
+echo "Now run ./configure and then make."
+exit 0
+
-- 
2.11.4.GIT