sniper Wed Jan 19 17:27:39 2005 EDT
Modified files:
/php-src/build build2.mk buildcheck.sh
Log:
Revert the multiple autoconf versions patch
http://cvs.php.net/diff.php/php-src/build/build2.mk?r1=1.31&r2=1.32&ty=u
Index: php-src/build/build2.mk
diff -u php-src/build/build2.mk:1.31 php-src/build/build2.mk:1.32
--- php-src/build/build2.mk:1.31 Mon Dec 20 15:23:57 2004
+++ php-src/build/build2.mk Wed Jan 19 17:27:39 2005
@@ -14,7 +14,7 @@
# | Author: Sascha Schumann <[EMAIL PROTECTED]> |
# +----------------------------------------------------------------------+
#
-# $Id: build2.mk,v 1.31 2004/12/20 20:23:57 sniper Exp $
+# $Id: build2.mk,v 1.32 2005/01/19 22:27:39 sniper Exp $
#
include generated_lists
@@ -46,8 +46,7 @@
# 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 @@
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)
http://cvs.php.net/diff.php/php-src/build/buildcheck.sh?r1=1.32&r2=1.33&ty=u
Index: php-src/build/buildcheck.sh
diff -u php-src/build/buildcheck.sh:1.32 php-src/build/buildcheck.sh:1.33
--- php-src/build/buildcheck.sh:1.32 Thu Dec 30 10:53:57 2004
+++ php-src/build/buildcheck.sh Wed Jan 19 17:27:39 2005
@@ -16,7 +16,7 @@
# | Sascha Schumann <[EMAIL PROTECTED]> |
# +----------------------------------------------------------------------+
#
-# $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 @@
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"
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
