Fix some tevent includes, trying to fix the build

[tprouty/samba.git] / source4 / autogen.sh

diff --git a/source4/autogen.sh b/source4/autogen.sh
index e5aa69776f3cf44a215d7a128ad5b24c8c2e4c7b..9984712caf81ce6130446cfa53d98c14776d0f27 100755 (executable)
--- a/source4/autogen.sh
+++ b/source4/autogen.sh
@@ -1,9 +1,21 @@
 #!/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"
 
@@ -12,7 +24,7 @@ AUTOCONFFOUND="0"
 
 
 ##
-## Look for autoheader 
+## Look for autoheader
 ##
 for i in $TESTAUTOHEADER; do
        if which $i > /dev/null 2>&1; then
@@ -24,7 +36,7 @@ for i in $TESTAUTOHEADER; do
        fi
 done
 
-## 
+##
 ## Look for autoconf
 ##
 
@@ -39,21 +51,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
@@ -65,4 +77,3 @@ rm -rf autom4te*.cache
 
 echo "Now run ./configure and then make."
 exit 0
-