diff options
| author | foobar <sniper@php.net> | 2004-12-20 20:23:57 +0000 |
|---|---|---|
| committer | foobar <sniper@php.net> | 2004-12-20 20:23:57 +0000 |
| commit | bc3f6c94d4527e35138f352928a02ad423d6374e (patch) | |
| tree | 2cd7add0a1bf1a8f4ee829d4939ce5b7e67db274 | |
| parent | fdaa130f3a516954c37804ac5362445485deec84 (diff) | |
| download | php-git-bc3f6c94d4527e35138f352928a02ad423d6374e.tar.gz | |
Fix buildconf when multiple autoconf versions installed
| -rw-r--r-- | build/build2.mk | 6 | ||||
| -rwxr-xr-x | build/buildcheck.sh | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/build/build2.mk b/build/build2.mk index 9b3d538d19..f114be3adc 100644 --- a/build/build2.mk +++ b/build/build2.mk @@ -46,7 +46,8 @@ $(config_h_in): configure acconfig.h # correctly otherwise (timestamps are not updated) @echo rebuilding $@ @rm -f $@ - @autoheader 2>&1 | $(SUPPRESS_WARNINGS) + @autoheader=`./build/shtool path autoheader-2.13 autoheader`; \ + $$autoheader 2>&1 | $(SUPPRESS_WARNINGS) $(TOUCH_FILES): touch $(TOUCH_FILES) @@ -61,4 +62,5 @@ aclocal.m4: configure.in acinclude.m4 configure: aclocal.m4 configure.in $(config_m4_files) @echo rebuilding $@ - @autoconf 2>&1 | $(SUPPRESS_WARNINGS) + @autoconf=`./build/shtool path autoconf-2.13 autoconf`; \ + $$autoconf 2>&1 | $(SUPPRESS_WARNINGS) diff --git a/build/buildcheck.sh b/build/buildcheck.sh index aed6126b5e..555cb35204 100755 --- a/build/buildcheck.sh +++ b/build/buildcheck.sh @@ -16,7 +16,7 @@ # | Sascha Schumann <sascha@schumann.cx> | # +----------------------------------------------------------------------+ # -# $Id: buildcheck.sh,v 1.30 2004-01-08 17:31:49 sniper Exp $ +# $Id: buildcheck.sh,v 1.31 2004-12-20 20:23:57 sniper Exp $ # echo "buildconf: checking installation..." @@ -24,7 +24,8 @@ echo "buildconf: checking installation..." stamp=$1 # autoconf 2.13 or newer -ac_version=`autoconf --version 2>/dev/null|head -n 1|sed -e 's/^[^0-9]*//' -e 's/[a-z]* *$//'` +autoconf=`./build/shtool path autoconf-2.13 autoconf 2> /dev/null` +ac_version=`$autoconf --version 2>/dev/null|head -n 1|sed -e 's/^[^0-9]*//' -e 's/[a-z]* *$//'` if test -z "$ac_version"; then echo "buildconf: autoconf not found." echo " You need autoconf version 2.13 or newer installed" |