Revert the multiple autoconf versions patch

diff --git a/build/build2.mk b/build/build2.mk
index f114be3adc0783ece303b0f2ba8076e9fd9bc3b8..9b3d538d196a4991b6870a1ad37cb90efa45e653 100644 (file)
--- 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 296c486d04e9c8e24b8a79ecb1c815a3fc2260f3..cc3cc420376ceb5366a87e629d927c069f4d7c4d 100755 (executable)
--- a/build/buildcheck.sh
+++ b/build/buildcheck.sh
@@ -16,7 +16,7 @@
 #  |          Sascha Schumann <sascha@schumann.cx>                        |
 #  +----------------------------------------------------------------------+
 #
-# $Id: buildcheck.sh,v 1.30.2.2 2004-12-30 16:07:43 rasmus Exp $ 
+# $Id: buildcheck.sh,v 1.30.2.3 2005-01-19 22:27:47 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"