r3855: Sync up with the one in the main source dir (yes, this should probably

be a symlink...).
Jeremy.

diff --git a/examples/VFS/autogen.sh b/examples/VFS/autogen.sh
index fcae16ec5c87e1a8c0305ae01cb56ad771c15ab4..e8160d2173149a9f8dc4988cea614b635f0c946a 100755 (executable)
--- a/examples/VFS/autogen.sh
+++ b/examples/VFS/autogen.sh
@@ -1,28 +1,28 @@
 #!/bin/sh
 
 #!/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
 
 ## 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"
+AUTOHEADERFOUND="0"

 AUTOCONFFOUND="0"
 
 
 ##
 ## Look for autoheader 
 ##
 AUTOCONFFOUND="0"
 
 
 ##
 ## Look for autoheader 
 ##

-#for i in $TESTAUTOHEADER; do
-#      if which $i > /dev/null 2>&1; then
-#              if [ `$i --version | head -n 1 | cut -d.  -f 2` -ge 53 ]; then
-#                      AUTOHEADER=$i
-#                      AUTOHEADERFOUND="1"
-#                      break
-#              fi
-#      fi
-#done
+for i in $TESTAUTOHEADER; do
+       if which $i > /dev/null 2>&1; then
+               if [ `$i --version | head -n 1 | cut -d.  -f 2 | tr -d [:alpha:]` -ge 53 ]; then
+                       AUTOHEADER=$i
+                       AUTOHEADERFOUND="1"
+                       break
+               fi
+       fi
+done

 
 ## 
 ## Look for autoconf
 
 ## 
 ## Look for autoconf


@@ -30,7 +30,7 @@ AUTOCONFFOUND="0"
 
 for i in $TESTAUTOCONF; do
        if which $i > /dev/null 2>&1; then
 
 for i in $TESTAUTOCONF; do
        if which $i > /dev/null 2>&1; then

-               if [ `$i --version | head -n 1 | cut -d.  -f 2` -ge 53 ]; then
+               if [ `$i --version | head -n 1 | cut -d.  -f 2 | tr -d [:alpha:]` -ge 53 ]; then

                        AUTOCONF=$i
                        AUTOCONFFOUND="1"
                        break
                        AUTOCONF=$i
                        AUTOCONFFOUND="1"
                        break


@@ -43,18 +43,23 @@ done
 ## do we have it?
 ##
 if [ "$AUTOCONFFOUND" = "0" -o "$AUTOHEADERFOUND" = "0" ]; then
 ## 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
+       echo "$0: need autoconf 2.53 or later to build samba from SVN" >&2

        exit 1
 fi
 
        exit 1
 fi
 

+echo "$0: running script/mkversion.sh"
+./script/mkversion.sh || exit 1

 
 

+rm -rf autom4te*.cache

 
 

-#echo "$0: running $AUTOHEADER"
-#$AUTOHEADER || exit 1
+echo "$0: running $AUTOHEADER"
+$AUTOHEADER || exit 1

 
 echo "$0: running $AUTOCONF"
 $AUTOCONF || exit 1
 
 
 echo "$0: running $AUTOCONF"
 $AUTOCONF || exit 1
 

+rm -rf autom4te*.cache
+

 echo "Now run ./configure and then make."
 exit 0
 
 echo "Now run ./configure and then make."
 exit 0