summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2004-11-18 18:40:39 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:53:21 -0500
commitc7e532496b689a04f7c7dc4144d0326e922f2e59 (patch)
tree3c1530663f9b2f880deb86c7b5560aec0d8515f4
parentea9f97886b8b76bc0d74f10eb7dfa53323b7e159 (diff)
downloadsamba-c7e532496b689a04f7c7dc4144d0326e922f2e59.tar.gz
samba-c7e532496b689a04f7c7dc4144d0326e922f2e59.tar.bz2
samba-c7e532496b689a04f7c7dc4144d0326e922f2e59.zip
r3855: Sync up with the one in the main source dir (yes, this should probably
be a symlink...). Jeremy. (This used to be commit 5b0da25796337b73d151a3025b7e460222164b3f)
-rwxr-xr-xexamples/VFS/autogen.sh39
1 files changed, 22 insertions, 17 deletions
diff --git a/examples/VFS/autogen.sh b/examples/VFS/autogen.sh
index fcae16ec5c..e8160d2173 100755
--- a/examples/VFS/autogen.sh
+++ b/examples/VFS/autogen.sh
@@ -1,28 +1,28 @@
#!/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"
+AUTOHEADERFOUND="0"
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
@@ -30,7 +30,7 @@ AUTOCONFFOUND="0"
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
@@ -43,18 +43,23 @@ 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
+ 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
-#echo "$0: running $AUTOHEADER"
-#$AUTOHEADER || exit 1
+echo "$0: running $AUTOHEADER"
+$AUTOHEADER || exit 1
echo "$0: running $AUTOCONF"
$AUTOCONF || exit 1
+rm -rf autom4te*.cache
+
echo "Now run ./configure and then make."
exit 0