r10656: BIG merge from trunk. Features not copied over

[ira/wip.git] / source3 / autogen.sh

diff --git a/source3/autogen.sh b/source3/autogen.sh
index 32dfd9f72a5d1b2ee025911d4915e8ed47a02f5d..3422d7cebfa5c4f87f77eb43c9f0ad77acbc8c22 100755 (executable)
--- a/source3/autogen.sh
+++ b/source3/autogen.sh
@@ -1,11 +1,11 @@
 #!/bin/sh
 
-# Run this script to build samba from CVS.
+# Run this script to build samba from SVN.
 
 ## insert all possible names (only works with 
 ## autoconf 2.x
-TESTAUTOHEADER="autoheader autoheader-2.53"
-TESTAUTOCONF="autoconf autoconf-2.53"
+TESTAUTOHEADER="autoheader autoheader-2.53 autoheader2.50"
+TESTAUTOCONF="autoconf autoconf-2.53 autoconf2.50"
 
 AUTOHEADERFOUND="0"
 AUTOCONFFOUND="0"
@@ -15,8 +15,8 @@ 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
+       if which $i > /dev/null 2>&1; then
+               if test `$i --version | head -n 1 | cut -d.  -f 2 | tr -d [:alpha:]` -ge 53; then
                        AUTOHEADER=$i
                        AUTOHEADERFOUND="1"
                        break
@@ -29,8 +29,8 @@ done
 ##
 
 for i in $TESTAUTOCONF; do
-       if which $i > /dev/null; then
-               if [ `$i --version | head -1 | cut -d.  -f 2` -ge 53 ]; then
+       if which $i > /dev/null 2>&1; then
+               if test `$i --version | head -n 1 | cut -d.  -f 2 | tr -d [:alpha:]` -ge 53; then
                        AUTOCONF=$i
                        AUTOCONFFOUND="1"
                        break
@@ -42,12 +42,16 @@ 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
+if test "$AUTOCONFFOUND" = "0" -o "$AUTOHEADERFOUND" = "0"; then
+       echo "$0: need autoconf 2.53 or later to build samba from SVN" >&2
        exit 1
 fi
 
+echo "$0: running script/mkversion.sh"
+./script/mkversion.sh || exit 1
 
+rm -rf autom4te*.cache
+rm -f configure include/config.h*
 
 echo "$0: running $AUTOHEADER"
 $AUTOHEADER || exit 1
@@ -55,6 +59,8 @@ $AUTOHEADER || exit 1
 echo "$0: running $AUTOCONF"
 $AUTOCONF || exit 1
 
+rm -rf autom4te*.cache
+
 echo "Now run ./configure and then make."
 exit 0