When setting a non-default ACL, don't forget to apply masks to SMB_ACL_USER and SMB_A...

[samba.git] / source4 / autogen.sh

diff --git a/source4/autogen.sh b/source4/autogen.sh
index b721a45a99c86d62ea7a91b4e7d52acbb31e2f03..1936af4351238fcf90731893ceff1c1119e1aadd 100755 (executable)
--- a/source4/autogen.sh
+++ b/source4/autogen.sh
@@ -2,6 +2,18 @@
 
 # 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)
 TESTAUTOHEADER="autoheader autoheader-2.53 autoheader2.50 autoheader259 autoheader253"
@@ -10,7 +22,12 @@ 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
 ##
@@ -48,12 +65,12 @@ if test "$AUTOCONFFOUND" = "0" -o "$AUTOHEADERFOUND" = "0"; then
 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,5 +80,5 @@ $AUTOCONF $IPATHS || exit 1
 
 rm -rf autom4te*.cache
 
-echo "Now run ./configure and then make."
+echo "Now run ./configure (or ./configure.developer) and then make."
 exit 0