Move common libraries from root to lib/.

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

diff --git a/source4/autogen.sh b/source4/autogen.sh
index 8d842a9cb5c9ff9b7e73ba4c0d2f3edafe2224e0..a56c5a223871923a5318e6248969801bb3af3ead 100755 (executable)
--- a/source4/autogen.sh
+++ b/source4/autogen.sh
@@ -1,9 +1,9 @@
 #!/bin/sh
 
-# Run this script to build samba from SVN.
+# Run this script to build samba from git.
 
-## 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,11 +12,11 @@ AUTOCONFFOUND="0"
 
 
 ##
-## Look for autoheader 
+## Look for autoheader
 ##
 for i in $TESTAUTOHEADER; do
        if which $i > /dev/null 2>&1; then
-               if test `$i --version | head -n 1 | cut -d.  -f 2 | tr -d [:alpha:]` -ge 53; then
+               if test `$i --version | head -n 1 | cut -d.  -f 2 | sed "s/[^0-9]//g"` -ge 53; then
                        AUTOHEADER=$i
                        AUTOHEADERFOUND="1"
                        break
@@ -24,13 +24,13 @@ for i in $TESTAUTOHEADER; do
        fi
 done
 
-## 
+##
 ## Look for autoconf
 ##
 
 for i in $TESTAUTOCONF; do
        if which $i > /dev/null 2>&1; then
-               if test `$i --version | head -n 1 | cut -d.  -f 2 | tr -d [:alpha:]` -ge 53; then
+               if test `$i --version | head -n 1 | cut -d.  -f 2 | sed "s/[^0-9]//g"` -ge 53; then
                        AUTOCONF=$i
                        AUTOCONFFOUND="1"
                        break
@@ -39,11 +39,11 @@ 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
 
@@ -53,7 +53,7 @@ echo "$0: running script/mkversion.sh"
 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,9 +63,5 @@ $AUTOCONF $IPATHS || exit 1
 
 rm -rf autom4te*.cache
 
-echo "$0: building Web Application Framework (SWAT)"
-make -C ../webapps/swat distclean build || exit 1
-
 echo "Now run ./configure and then make."
 exit 0
-