diff options
| author | foobar <sniper@php.net> | 2005-01-19 22:27:39 +0000 |
|---|---|---|
| committer | foobar <sniper@php.net> | 2005-01-19 22:27:39 +0000 |
| commit | ed25ab62f536a4142f09fbe17bc0a1a9c6fd4877 (patch) | |
| tree | e4e1af7e822bc89ad447bf5b41565603d9f656d3 | |
| parent | e8300c82a00c3d9784e61012d016434dfe76633f (diff) | |
| download | php-git-ed25ab62f536a4142f09fbe17bc0a1a9c6fd4877.tar.gz | |
Revert the multiple autoconf versions patch
| -rw-r--r-- | build/build2.mk | 6 | ||||
| -rwxr-xr-x | build/buildcheck.sh | 5 |
2 files changed, 4 insertions, 7 deletions
diff --git a/build/build2.mk b/build/build2.mk index f114be3adc..9b3d538d19 100644 --- a/build/build2.mk +++ b/build/build2.mk @@ -46,8 +46,7 @@ $(config_h_in): configure acconfig.h # correctly otherwise (timestamps are not updated) @echo rebuilding $@ @rm -f $@ - @autoheader=`./build/shtool path autoheader-2.13 autoheader`; \ - $$autoheader 2>&1 | $(SUPPRESS_WARNINGS) + @autoheader 2>&1 | $(SUPPRESS_WARNINGS) $(TOUCH_FILES): touch $(TOUCH_FILES) @@ -62,5 +61,4 @@ aclocal.m4: configure.in acinclude.m4 configure: aclocal.m4 configure.in $(config_m4_files) @echo rebuilding $@ - @autoconf=`./build/shtool path autoconf-2.13 autoconf`; \ - $$autoconf 2>&1 | $(SUPPRESS_WARNINGS) + @autoconf 2>&1 | $(SUPPRESS_WARNINGS) diff --git a/build/buildcheck.sh b/build/buildcheck.sh index 5ecbf432e9..7ce21a157a 100755 --- a/build/buildcheck.sh +++ b/build/buildcheck.sh @@ -16,7 +16,7 @@ # | Sascha Schumann <sascha@schumann.cx> | # +----------------------------------------------------------------------+ # -# $Id: buildcheck.sh,v 1.32 2004-12-30 15:53:57 rasmus Exp $ +# $Id: buildcheck.sh,v 1.33 2005-01-19 22:27:39 sniper Exp $ # echo "buildconf: checking installation..." @@ -24,8 +24,7 @@ echo "buildconf: checking installation..." stamp=$1 # autoconf 2.13 or newer -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]* *$//'` +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" |