MFH: Fix buildconf when multiple autoconf versions installed

diff --git a/build/build2.mk b/build/build2.mk
index 654efd096735cd295561d5e9b916717dac149dc1..020dd9a83b02116259f40887e61b04e8f2d0675f 100644 (file)
--- 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 cb62a41512052ffe62229e3629f37cb77f6a2449..a1fc7010d9c02e5ce917c1ae2df8cfa6c1f1c3b2 100755 (executable)
--- a/build/buildcheck.sh
+++ b/build/buildcheck.sh
@@ -16,7 +16,7 @@
 #  |          Sascha Schumann <sascha@schumann.cx>                        |
 #  +----------------------------------------------------------------------+
 #
-# $Id: buildcheck.sh,v 1.21.2.6 2003-09-28 13:37:59 tal Exp $ 
+# $Id: buildcheck.sh,v 1.21.2.7 2004-12-20 20:24:23 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"