[PATCH] autogen.sh

[Willi Mann]

Hi!

This patch fixes autogen.sh on systems which have only autoconf-2.53 
installed. It makes it simple to add other autoconf versions which might 
occur in the future (TESTAUTOCONF/HEADER var). I've only tested it on 
RedHat 7.3 with 3.0 branch, so please review it carefully before you 
apply it.

Willi Mann



--- autogen.sh	10 Feb 2003 17:31:25 -0000	1.1.2.2
+++ autogen.sh	17 Mar 2003 20:32:43 -0000
@@ -2,29 +2,46 @@

  # 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
+## insert all possible names
+TESTAUTOHEADER="autoheader autoheader-2.53"
+TESTAUTOCONF="autoconf autoconf-2.53"
+
+AUTOHEADERFOUND="0"
+AUTOCONFFOUND="0"
+

-	## maybe it's installed under a different name (e.g. RedHat 7.3)
+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

-	AUTOCONF="autoconf-2.53"
-	AUTOHEADER="autoheader-2.53"
+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;

+
+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