sniper          Mon Dec 20 15:24:23 2004 EDT

  Modified files:              (Branch: PHP_4_3)
    /php-src/build      build2.mk buildcheck.sh 
  Log:
  MFH: Fix buildconf when multiple autoconf versions installed
  
http://cvs.php.net/diff.php/php-src/build/build2.mk?r1=1.27.4.1&r2=1.27.4.2&ty=u
Index: php-src/build/build2.mk
diff -u php-src/build/build2.mk:1.27.4.1 php-src/build/build2.mk:1.27.4.2
--- php-src/build/build2.mk:1.27.4.1    Thu Jun 26 20:19:26 2003
+++ php-src/build/build2.mk     Mon Dec 20 15:24:23 2004
@@ -14,7 +14,7 @@
 #  | Author: Sascha Schumann <[EMAIL PROTECTED]>                         |
 #  +----------------------------------------------------------------------+
 #
-# $Id: build2.mk,v 1.27.4.1 2003/06/27 00:19:26 sas Exp $ 
+# $Id: build2.mk,v 1.27.4.2 2004/12/20 20:24:23 sniper Exp $ 
 #
 
 include generated_lists
@@ -46,7 +46,8 @@
 # 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 @@
 
 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)
http://cvs.php.net/diff.php/php-src/build/buildcheck.sh?r1=1.21.2.6&r2=1.21.2.7&ty=u
Index: php-src/build/buildcheck.sh
diff -u php-src/build/buildcheck.sh:1.21.2.6 
php-src/build/buildcheck.sh:1.21.2.7
--- php-src/build/buildcheck.sh:1.21.2.6        Sun Sep 28 09:37:59 2003
+++ php-src/build/buildcheck.sh Mon Dec 20 15:24:23 2004
@@ -16,7 +16,7 @@
 #  |          Sascha Schumann <[EMAIL PROTECTED]>                        |
 #  +----------------------------------------------------------------------+
 #
-# $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 @@
 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"

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to