git.samba.org
/
kai
/
samba-autobuild
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
s3: Remove an unused variable
[kai/samba-autobuild/.git]
/
source3
/
autogen.sh
diff --git
a/source3/autogen.sh
b/source3/autogen.sh
index 3422d7cebfa5c4f87f77eb43c9f0ad77acbc8c22..e99c90c49f0261217bfee57e826233cb69396430 100755
(executable)
--- a/
source3/autogen.sh
+++ b/
source3/autogen.sh
@@
-1,11
+1,23
@@
#!/bin/sh
#!/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
## insert all possible names (only works with
-## autoconf 2.x
-TESTAUTOHEADER="autoheader autoheader-2.53 autoheader2.50"
-TESTAUTOCONF="autoconf autoconf-2.53 autoconf2.50"
+## 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"
AUTOHEADERFOUND="0"
AUTOCONFFOUND="0"
@@
-16,7
+28,7
@@
AUTOCONFFOUND="0"
##
for i in $TESTAUTOHEADER; do
if which $i > /dev/null 2>&1; then
##
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
AUTOHEADER=$i
AUTOHEADERFOUND="1"
break
@@
-30,7
+42,7
@@
done
for i in $TESTAUTOCONF; do
if which $i > /dev/null 2>&1; then
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
AUTOCONF=$i
AUTOCONFFOUND="1"
break
@@
-43,24
+55,26
@@
done
## do we have it?
##
if test "$AUTOCONFFOUND" = "0" -o "$AUTOHEADERFOUND" = "0"; then
## 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"
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.h*
rm -rf autom4te*.cache
rm -f configure include/config.h*
-echo "$0: running $AUTOHEADER"
-$AUTOHEADER || exit 1
+IPATHS="-Im4 -I../m4 -I../lib/replace -I../source4"
+
+echo "$0: running $AUTOHEADER $IPATHS"
+$AUTOHEADER $IPATHS || exit 1
-echo "$0: running $AUTOCONF"
-$AUTOCONF || exit 1
+echo "$0: running $AUTOCONF
$IPATHS
"
+$AUTOCONF
$IPATHS
|| exit 1
rm -rf autom4te*.cache
rm -rf autom4te*.cache
-echo "Now run ./configure and then make."
+echo "Now run ./configure
(or ./configure.developer)
and then make."
exit 0
exit 0