s4:pwsettings: Run all updates as a single modify() operation.

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

diff --git a/source4/autogen.sh b/source4/autogen.sh
index 67a3df3bd973aeaa957c691a68305cd634596458..1936af4351238fcf90731893ceff1c1119e1aadd 100755 (executable)
--- a/source4/autogen.sh
+++ b/source4/autogen.sh
@@ -1,18 +1,35 @@
 #!/bin/sh
 
-# Run this script to build samba from SVN.
+# Run this script to build samba from git.
+
+while true; do
+    case $1 in
+       --version-file)
+           VERSION_FILE=$2
+           shift 2
+           ;;
+       *)
+           break
+           ;;
+    esac
+done
 
-## 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 autoheader2.50 autoheader259 autoheader253"
 TESTAUTOCONF="autoconf autoconf-2.53 autoconf2.50 autoconf259 autoconf253"
 
 AUTOHEADERFOUND="0"
 AUTOCONFFOUND="0"
 
-
+if which which > /dev/null 2>&1; then
+        echo -n
+else
+       echo "$0: need 'which' to figure out if we have the right autoconf to build samba from git" >&2
+       exit 1
+fi
 ##
-## Look for autoheader 
+## Look for autoheader
 ##
 for i in $TESTAUTOHEADER; do
        if which $i > /dev/null 2>&1; then
@@ -24,7 +41,7 @@ for i in $TESTAUTOHEADER; do
        fi
 done
 
-## 
+##
 ## Look for autoconf
 ##
 
@@ -39,21 +56,21 @@ for i in $TESTAUTOCONF; do
 done
 
 
-## 
+##
 ## do we have it?
 ##
 if test "$AUTOCONFFOUND" = "0" -o "$AUTOHEADERFOUND" = "0"; then
-       echo "$0: need autoconf 2.53 or later to build samba from SVN" >&2
+       echo "$0: need autoconf 2.53 or later to build samba from git" >&2
        exit 1
 fi
 
 echo "$0: running script/mkversion.sh"
-./script/mkversion.sh || exit 1
+./script/mkversion.sh $VERSION_FILE || exit 1
 
 rm -rf autom4te*.cache
 rm -f configure include/config_tmp.h*
 
-IPATHS="-I. -Ilib/replace"
+IPATHS="-I. -I../lib/replace"
 
 echo "$0: running $AUTOHEADER $IPATHS"
 $AUTOHEADER $IPATHS || exit 1
@@ -63,16 +80,5 @@ $AUTOCONF $IPATHS || exit 1
 
 rm -rf autom4te*.cache
 
-# Run swig if it is available
-SWIG=swig
-SWIG_FILES="./scripting/python/misc.i ./auth/auth.i ./auth/credentials/credentials.i ./lib/talloc/talloc.i ./lib/ldb/ldb.i ./lib/registry/registry.i ./lib/tdb/tdb.i ./libcli/swig/libcli_smb.i ./libcli/swig/libcli_nbt.i ./librpc/rpc/dcerpc.i"
-if which $SWIG >/dev/null 2>&1; then
-       for I in $SWIG_FILES
-       do
-               echo "$0: running $SWIG for $I"
-               swig -python -keyword $I
-       done
-fi
-
-echo "Now run ./configure and then make."
+echo "Now run ./configure (or ./configure.developer) and then make."
 exit 0