summaryrefslogtreecommitdiff
path: root/source3/autogen.sh
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2004-04-14 08:47:53 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 10:51:14 -0500
commitf8c418a0afba2aae6449e91ec83312cb92a46c34 (patch)
treef86a0daa2be0c9aa9f240a3dadf02199779a338a /source3/autogen.sh
parent8e87cf8ad99d8e67620222959ce54f199b231025 (diff)
downloadsamba-f8c418a0afba2aae6449e91ec83312cb92a46c34.tar.gz
samba-f8c418a0afba2aae6449e91ec83312cb92a46c34.tar.bz2
samba-f8c418a0afba2aae6449e91ec83312cb92a46c34.zip
r208: merge the version schema changes from 4_0
metze (This used to be commit 4d9d8e83aa367fe17a74b81d4417cc2cfbdf200e)
Diffstat (limited to 'source3/autogen.sh')
-rwxr-xr-xsource3/autogen.sh16
1 files changed, 8 insertions, 8 deletions
diff --git a/source3/autogen.sh b/source3/autogen.sh
index 6042b82cdc..922cad8e61 100755
--- 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"
@@ -43,11 +43,14 @@ 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
@@ -55,10 +58,7 @@ $AUTOHEADER || exit 1
echo "$0: running $AUTOCONF"
$AUTOCONF || exit 1
-echo "$0: running script/mkversion.sh"
-./script/mkversion.sh || exit 1
-
-rm -rf autom4te.cache autom4te-2.53.cache
+rm -rf autom4te*.cache
echo "Now run ./configure and then make."
exit 0