From 22e23401551e8c35fea8d7601420e746cb4a2527 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Tue, 4 Feb 2003 10:54:01 +0000 Subject: Add autogen.sh from distcc via mbp. This to allow us to remove configure from CVS. (This used to be commit 9e8e352e102b75489b4540d701ce2c67c0f3cf31) --- source3/autogen.sh | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100755 source3/autogen.sh (limited to 'source3/autogen.sh') diff --git a/source3/autogen.sh b/source3/autogen.sh new file mode 100755 index 0000000000..28d1608287 --- /dev/null +++ b/source3/autogen.sh @@ -0,0 +1,19 @@ +#! /bin/sh + +# Run this script to build samba from CVS. + +if which autoconf > /dev/null +then + : +else + echo "$0: need autoconf 2.53 or later to build samba from CVS" >&2 + exit 1 +fi + +echo "$0: running autoheader" +autoheader || exit 1 + +echo "$0: running autoconf" +autoconf || exit 1 +echo "Now run ./configure and then make." +exit 0 -- cgit From 89393d93b0d58504b65a423cc442bee4d7051298 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Mon, 10 Feb 2003 17:31:25 +0000 Subject: autogen - cope with autoconf-2.53/2.13 systems (like RH 7.3) findsmb - use @PERL@ (This used to be commit f869db787b555dc99e30d82493666c8a388f8f81) --- source3/autogen.sh | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) (limited to 'source3/autogen.sh') diff --git a/source3/autogen.sh b/source3/autogen.sh index 28d1608287..a2228a6fd9 100755 --- a/source3/autogen.sh +++ b/source3/autogen.sh @@ -2,7 +2,11 @@ # Run this script to build samba from CVS. -if which autoconf > /dev/null +## first try the default names +AUTOHEADER="autoheader" +AUTOCONF="autoconf" + +if which $AUTOCONF > /dev/null then : else @@ -10,10 +14,23 @@ else exit 1 fi -echo "$0: running autoheader" -autoheader || exit 1 +## +## what version do we need? +## +if [ `$AUTOCONF --version | head -1 | cut -d. -f 2` -lt 53 ]; then + + ## maybe it's installed under a different name (e.g. RedHat 7.3) + + AUTOCONF="autoconf-2.53" + AUTOHEADER="autoheader-2.53" + +fi + +echo "$0: running $AUTOHEADER" +$AUTOHEADER || exit 1 + +echo "$0: running $AUTOCONF" +$AUTOCONF || exit 1 -echo "$0: running autoconf" -autoconf || exit 1 echo "Now run ./configure and then make." exit 0 -- cgit From e655dc297b6dfa381748c1c6b990781af46457c1 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Fri, 4 Apr 2003 00:12:34 +0000 Subject: better method of locating autoconf and autoheader; patch by Willi Mann (This used to be commit 521ab105b2fb240c6e97b3e3d50a9e1590d14931) --- source3/autogen.sh | 56 ++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 40 insertions(+), 16 deletions(-) (limited to 'source3/autogen.sh') diff --git a/source3/autogen.sh b/source3/autogen.sh index a2228a6fd9..869f1d2f5e 100755 --- a/source3/autogen.sh +++ b/source3/autogen.sh @@ -2,30 +2,53 @@ # Run this script to build samba from CVS. -## first try the default names -AUTOHEADER="autoheader" -AUTOCONF="autoconf" - -if which $AUTOCONF > /dev/null -then - : -else - echo "$0: need autoconf 2.53 or later to build samba from CVS" >&2 - exit 1 -fi +## insert all possible names (only works with +## autoconf 2.x +TESTAUTOHEADER="autoheader autoheader-2.53" +TESTAUTOCONF="autoconf autoconf-2.53" + +AUTOHEADERFOUND="0" +AUTOCONFFOUND="0" + +## +## Look for autoheader ## -## what version do we need? +for i in $TESTAUTOHEADER; do + if which $i >& /dev/null; then + if [ `$i --version | head -1 | cut -d. -f 2` -ge 53 ]; then + AUTOHEADER=$i + AUTOHEADERFOUND="1" + break + fi + fi +done + +## +## Look for autoconf ## -if [ `$AUTOCONF --version | head -1 | cut -d. -f 2` -lt 53 ]; then - ## maybe it's installed under a different name (e.g. RedHat 7.3) +for i in $TESTAUTOCONF; do + if which $i >& /dev/null; then + if [ `$i --version | head -1 | cut -d. -f 2` -ge 53 ]; then + AUTOCONF=$i + AUTOCONFFOUND="1" + break + fi + fi +done - AUTOCONF="autoconf-2.53" - AUTOHEADER="autoheader-2.53" +## +## do we have it? +## +if [ "$AUTOCONFFOUND" == "0" -o "$AUTOHEADERFOUND" == "0" ]; then + echo "$0: need autoconf 2.53 or later to build samba from CVS" >&2 + exit 1 fi + + echo "$0: running $AUTOHEADER" $AUTOHEADER || exit 1 @@ -34,3 +57,4 @@ $AUTOCONF || exit 1 echo "Now run ./configure and then make." exit 0 + -- cgit From 0b74dbcf60c6cb2db66076af9a0bcfab5dfe084c Mon Sep 17 00:00:00 2001 From: Richard Sharpe Date: Fri, 11 Apr 2003 18:05:07 +0000 Subject: Janitorial duties to make autogen.sh portable. (This used to be commit c1559003fe0d62539633235c3f7c3e6a1427fda4) --- source3/autogen.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'source3/autogen.sh') diff --git a/source3/autogen.sh b/source3/autogen.sh index 869f1d2f5e..be3e473b40 100755 --- a/source3/autogen.sh +++ b/source3/autogen.sh @@ -1,4 +1,4 @@ -#! /bin/sh +#!/bin/sh # Run this script to build samba from CVS. @@ -15,7 +15,7 @@ AUTOCONFFOUND="0" ## Look for autoheader ## for i in $TESTAUTOHEADER; do - if which $i >& /dev/null; then + if which $i > /dev/null 2>&1; then if [ `$i --version | head -1 | cut -d. -f 2` -ge 53 ]; then AUTOHEADER=$i AUTOHEADERFOUND="1" @@ -29,7 +29,7 @@ done ## for i in $TESTAUTOCONF; do - if which $i >& /dev/null; then + if which $i > /dev/null 2>&1; then if [ `$i --version | head -1 | cut -d. -f 2` -ge 53 ]; then AUTOCONF=$i AUTOCONFFOUND="1" @@ -42,7 +42,7 @@ done ## ## do we have it? ## -if [ "$AUTOCONFFOUND" == "0" -o "$AUTOHEADERFOUND" == "0" ]; then +if [ "$AUTOCONFFOUND" = "0" -o "$AUTOHEADERFOUND" = "0" ]; then echo "$0: need autoconf 2.53 or later to build samba from CVS" >&2 exit 1 fi -- cgit From 23d30cbf9f3927aeabcffa8f2a82c79feab46f65 Mon Sep 17 00:00:00 2001 From: Tim Potter Date: Thu, 22 May 2003 00:49:24 +0000 Subject: Merge of head(1) portability patch. (This used to be commit 9192921c115b881d687f28d016c478192ab4d4ae) --- source3/autogen.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source3/autogen.sh') diff --git a/source3/autogen.sh b/source3/autogen.sh index be3e473b40..2d91173f4a 100755 --- a/source3/autogen.sh +++ b/source3/autogen.sh @@ -16,7 +16,7 @@ AUTOCONFFOUND="0" ## for i in $TESTAUTOHEADER; do if which $i > /dev/null 2>&1; then - if [ `$i --version | head -1 | cut -d. -f 2` -ge 53 ]; then + if [ `$i --version | head -n 1 | cut -d. -f 2` -ge 53 ]; then AUTOHEADER=$i AUTOHEADERFOUND="1" break @@ -30,7 +30,7 @@ done for i in $TESTAUTOCONF; do if which $i > /dev/null 2>&1; then - if [ `$i --version | head -1 | cut -d. -f 2` -ge 53 ]; then + if [ `$i --version | head -n 1 | cut -d. -f 2` -ge 53 ]; then AUTOCONF=$i AUTOCONFFOUND="1" break -- cgit From 8bfe26b62db2e671b143d93a5428f8fb64a9df05 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Wed, 20 Aug 2003 17:13:38 +0000 Subject: metze's autogenerate patch for version.h (This used to be commit ae452e51b02672a56adf18aa7a7e365eeaba9272) --- source3/autogen.sh | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'source3/autogen.sh') diff --git a/source3/autogen.sh b/source3/autogen.sh index 2d91173f4a..6042b82cdc 100755 --- a/source3/autogen.sh +++ b/source3/autogen.sh @@ -55,6 +55,11 @@ $AUTOHEADER || exit 1 echo "$0: running $AUTOCONF" $AUTOCONF || exit 1 +echo "$0: running script/mkversion.sh" +./script/mkversion.sh || exit 1 + +rm -rf autom4te.cache autom4te-2.53.cache + echo "Now run ./configure and then make." exit 0 -- cgit From f8c418a0afba2aae6449e91ec83312cb92a46c34 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 14 Apr 2004 08:47:53 +0000 Subject: r208: merge the version schema changes from 4_0 metze (This used to be commit 4d9d8e83aa367fe17a74b81d4417cc2cfbdf200e) --- source3/autogen.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'source3/autogen.sh') diff --git a/source3/autogen.sh b/source3/autogen.sh index 6042b82cdc..922cad8e61 100755 --- a/source3/autogen.sh +++ b/source3/autogen.sh @@ -1,11 +1,11 @@ #!/bin/sh -# Run this script to build samba from CVS. +# Run this script to build samba from SVN. ## insert all possible names (only works with ## autoconf 2.x -TESTAUTOHEADER="autoheader autoheader-2.53" -TESTAUTOCONF="autoconf autoconf-2.53" +TESTAUTOHEADER="autoheader autoheader-2.53 autoheader2.50" +TESTAUTOCONF="autoconf autoconf-2.53 autoconf2.50" AUTOHEADERFOUND="0" AUTOCONFFOUND="0" @@ -43,11 +43,14 @@ done ## do we have it? ## if [ "$AUTOCONFFOUND" = "0" -o "$AUTOHEADERFOUND" = "0" ]; then - echo "$0: need autoconf 2.53 or later to build samba from CVS" >&2 + echo "$0: need autoconf 2.53 or later to build samba from SVN" >&2 exit 1 fi +echo "$0: running script/mkversion.sh" +./script/mkversion.sh || exit 1 +rm -rf autom4te*.cache echo "$0: running $AUTOHEADER" $AUTOHEADER || exit 1 @@ -55,10 +58,7 @@ $AUTOHEADER || exit 1 echo "$0: running $AUTOCONF" $AUTOCONF || exit 1 -echo "$0: running script/mkversion.sh" -./script/mkversion.sh || exit 1 - -rm -rf autom4te.cache autom4te-2.53.cache +rm -rf autom4te*.cache echo "Now run ./configure and then make." exit 0 -- cgit From de72d898778635af20a1f6a394fe6c837e2ed149 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Thu, 23 Sep 2004 18:11:08 +0000 Subject: r2567: Patches from Lars Mueller : trivial fix for autoconf and autoheader versions with a letter in the version string. This happens in our current beta named distribution tree. trivial patch to fix the build with the upcoming libtool version. It will be mandatory to use --mode while using libtool. (This used to be commit 80d591f8cc62d513eb99112e6533b93ee901d27d) --- source3/autogen.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source3/autogen.sh') diff --git a/source3/autogen.sh b/source3/autogen.sh index 922cad8e61..e8160d2173 100755 --- a/source3/autogen.sh +++ b/source3/autogen.sh @@ -16,7 +16,7 @@ AUTOCONFFOUND="0" ## for i in $TESTAUTOHEADER; do if which $i > /dev/null 2>&1; then - if [ `$i --version | head -n 1 | cut -d. -f 2` -ge 53 ]; then + if [ `$i --version | head -n 1 | cut -d. -f 2 | tr -d [:alpha:]` -ge 53 ]; then AUTOHEADER=$i AUTOHEADERFOUND="1" break @@ -30,7 +30,7 @@ done for i in $TESTAUTOCONF; do if which $i > /dev/null 2>&1; then - if [ `$i --version | head -n 1 | cut -d. -f 2` -ge 53 ]; then + if [ `$i --version | head -n 1 | cut -d. -f 2 | tr -d [:alpha:]` -ge 53 ]; then AUTOCONF=$i AUTOCONFFOUND="1" break -- cgit From 28b78137767bd3822d0f122ac10057a240ff379e Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 6 Jan 2005 17:25:34 +0000 Subject: r4573: merge -r 4572 from SAMBA_4_0: remove configure and include/config.h* before running autoheader && autoconf this fixes bug where configure didn't get correctly updated (I assume autoconf uses some caching...) metze (This used to be commit 40d7d419dd0067e11c10c7c532c3ec0de5d7cfeb) --- source3/autogen.sh | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/autogen.sh') diff --git a/source3/autogen.sh b/source3/autogen.sh index e8160d2173..3c2011e5a7 100755 --- a/source3/autogen.sh +++ b/source3/autogen.sh @@ -51,6 +51,7 @@ echo "$0: running script/mkversion.sh" ./script/mkversion.sh || exit 1 rm -rf autom4te*.cache +rm -f configure include/config.h* echo "$0: running $AUTOHEADER" $AUTOHEADER || exit 1 -- cgit From 21dbed36e98bab3bc7854a2d8063ae282aeb910e Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Mon, 7 Feb 2005 22:21:49 +0000 Subject: r5270: fixing some bashism's in autogen.sh (This used to be commit c8b79cd78cff6f5f784d16e6c3168c9ac2c1cf1a) --- source3/autogen.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source3/autogen.sh') diff --git a/source3/autogen.sh b/source3/autogen.sh index 3c2011e5a7..3422d7cebf 100755 --- a/source3/autogen.sh +++ b/source3/autogen.sh @@ -16,7 +16,7 @@ AUTOCONFFOUND="0" ## for i in $TESTAUTOHEADER; do if which $i > /dev/null 2>&1; then - if [ `$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 | tr -d [:alpha:]` -ge 53; then AUTOHEADER=$i AUTOHEADERFOUND="1" break @@ -30,7 +30,7 @@ done for i in $TESTAUTOCONF; do if which $i > /dev/null 2>&1; then - if [ `$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 | tr -d [:alpha:]` -ge 53; then AUTOCONF=$i AUTOCONFFOUND="1" break @@ -42,7 +42,7 @@ done ## ## do we have it? ## -if [ "$AUTOCONFFOUND" = "0" -o "$AUTOHEADERFOUND" = "0" ]; then +if test "$AUTOCONFFOUND" = "0" -o "$AUTOHEADERFOUND" = "0"; then echo "$0: need autoconf 2.53 or later to build samba from SVN" >&2 exit 1 fi -- cgit From 8f153c6128dd15fb132d8ddb1752e793bd6a5985 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 18 Sep 2006 22:49:20 +0000 Subject: r18644: bring in libreplace in lib/replace metze (This used to be commit 596cbe73dd268742acf456fccd8a234376fb0c97) --- source3/autogen.sh | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'source3/autogen.sh') diff --git a/source3/autogen.sh b/source3/autogen.sh index 3422d7cebf..4d3488c9a4 100755 --- a/source3/autogen.sh +++ b/source3/autogen.sh @@ -4,8 +4,8 @@ ## insert all possible names (only works with ## autoconf 2.x -TESTAUTOHEADER="autoheader autoheader-2.53 autoheader2.50" -TESTAUTOCONF="autoconf autoconf-2.53 autoconf2.50" +TESTAUTOHEADER="autoheader autoheader-2.53 autoheader2.50 autoheader259 autoheader253" +TESTAUTOCONF="autoconf autoconf-2.53 autoconf2.50 autoconf259 autoconf253" AUTOHEADERFOUND="0" AUTOCONFFOUND="0" @@ -53,11 +53,13 @@ echo "$0: running script/mkversion.sh" rm -rf autom4te*.cache rm -f configure include/config.h* -echo "$0: running $AUTOHEADER" -$AUTOHEADER || exit 1 +IPATHS="-I. -Ilib/replace" -echo "$0: running $AUTOCONF" -$AUTOCONF || exit 1 +echo "$0: running $AUTOHEADER $IPATHS" +$AUTOHEADER $IPATHS || exit 1 + +echo "$0: running $AUTOCONF $IPATHS" +$AUTOCONF $IPATHS || exit 1 rm -rf autom4te*.cache -- cgit From 821bf2bd7278da4e71fcdcfc03348a712cd0fc90 Mon Sep 17 00:00:00 2001 From: James Peach Date: Sun, 22 Apr 2007 03:17:31 +0000 Subject: r22441: Add automatic dependency tracking. The dependency generation is toolchain independent, but since there's no portable method for doing makefile includes, we can actually use the dependencies with GNU make. It's easy to add this for other makes, but I don't have any to test. This also moves as much m4 as possible into the m4 directory where no-one has to look at it. AFAICT, there's no way to hide depcomp in there too, which is unfortunate. (This used to be commit aa14900f8291a017aa7fab2bbb9a6c79b12889b2) --- source3/autogen.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/autogen.sh') diff --git a/source3/autogen.sh b/source3/autogen.sh index 4d3488c9a4..3a58b29f60 100755 --- a/source3/autogen.sh +++ b/source3/autogen.sh @@ -53,7 +53,7 @@ echo "$0: running script/mkversion.sh" rm -rf autom4te*.cache rm -f configure include/config.h* -IPATHS="-I. -Ilib/replace" +IPATHS="-Im4 -Ilib/replace" echo "$0: running $AUTOHEADER $IPATHS" $AUTOHEADER $IPATHS || exit 1 -- cgit From 544b376d1a9f7a538083f4bc0f905a26a003cc33 Mon Sep 17 00:00:00 2001 From: Gerald Carter Date: Thu, 7 Jun 2007 13:35:39 +0000 Subject: r23377: Patch from Bjoern Jacke to deal with non-GNU implementations of tr in autogen.sh (This used to be commit ccc466c56a93906ef5dfa1079796b1a8a44b43c0) --- source3/autogen.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source3/autogen.sh') diff --git a/source3/autogen.sh b/source3/autogen.sh index 3a58b29f60..02f55c5421 100755 --- a/source3/autogen.sh +++ b/source3/autogen.sh @@ -16,7 +16,7 @@ AUTOCONFFOUND="0" ## 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 @@ -30,7 +30,7 @@ done 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 -- cgit From 99e73df8e81492c3545e93c4fec1cd3c5320f0b4 Mon Sep 17 00:00:00 2001 From: Karolin Seeger Date: Tue, 17 Jun 2008 10:36:51 +0200 Subject: Remove references to SVN. Karolin (This used to be commit 9d69a809e370f98057e514a3c755b0b86ee5f610) --- source3/autogen.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source3/autogen.sh') diff --git a/source3/autogen.sh b/source3/autogen.sh index 02f55c5421..018944e684 100755 --- a/source3/autogen.sh +++ b/source3/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 +## autoconf 2.x) TESTAUTOHEADER="autoheader autoheader-2.53 autoheader2.50 autoheader259 autoheader253" TESTAUTOCONF="autoconf autoconf-2.53 autoconf2.50 autoconf259 autoconf253" @@ -43,7 +43,7 @@ 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 -- cgit