From f0baa2345b8eb97416d408fc2180040cf50b4c2c Mon Sep 17 00:00:00 2001 From: foobar Date: Wed, 19 Jan 2005 22:27:59 +0000 Subject: [PATCH] Revert the multiple autoconf versions patch --- build/build2.mk | 6 ++---- build/buildcheck.sh | 5 ++--- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/build/build2.mk b/build/build2.mk index f886ba1b3c..e0472ad6b9 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 9afdd6e2fb..f9ee56bc5d 100755 --- a/build/buildcheck.sh +++ b/build/buildcheck.sh @@ -16,7 +16,7 @@ # | Sascha Schumann | # +----------------------------------------------------------------------+ # -# $Id: buildcheck.sh,v 1.21.2.9 2004-12-30 19:54:46 rasmus Exp $ +# $Id: buildcheck.sh,v 1.21.2.10 2005-01-19 22:27:59 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" -- 2.40.0