jon Mon Apr 4 03:16:02 2005 EDT
Modified files:
/php-src NEWS
/php-src/build build2.mk buildcheck.sh
Log:
Adding the ability to override the autotools executables used by the
buildconf script via the PHP_AUTOCONF and PHP_AUTOHEADER environmental
variables.
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1862&r2=1.1863&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1862 php-src/NEWS:1.1863
--- php-src/NEWS:1.1862 Sun Apr 3 17:57:34 2005
+++ php-src/NEWS Mon Apr 4 03:15:59 2005
@@ -28,6 +28,8 @@
. added spl_autoload*() functions
. converted several 5.0 examples into c code
. added class File
+- Added the ability to override the autotools executables used by the buildconf
+ script via the PHP_AUTOCONF and PHP_AUTOHEADER environmental variables. (Jon)
- Added several new functions to support the PostgreSQL v3 protocol introduced
in PostgreSQL 7.4. (Christopher)
. pg_transaction_status() - in-transaction status of a database connection.
http://cvs.php.net/diff.php/php-src/build/build2.mk?r1=1.35&r2=1.36&ty=u
Index: php-src/build/build2.mk
diff -u php-src/build/build2.mk:1.35 php-src/build/build2.mk:1.36
--- php-src/build/build2.mk:1.35 Thu Feb 3 12:42:42 2005
+++ php-src/build/build2.mk Mon Apr 4 03:16:01 2005
@@ -14,7 +14,7 @@
# | Author: Sascha Schumann <[EMAIL PROTECTED]> |
# +----------------------------------------------------------------------+
#
-# $Id: build2.mk,v 1.35 2005/02/03 17:42:42 sniper Exp $
+# $Id: build2.mk,v 1.36 2005/04/04 07:16:01 jon Exp $
#
include generated_lists
@@ -32,6 +32,9 @@
targets = $(TOUCH_FILES) configure $(config_h_in)
+PHP_AUTOCONF ?= 'autoconf'
+PHP_AUTOHEADER ?= 'autoheader'
+
SUPPRESS_WARNINGS ?= 2>&1 | (egrep -v '(AC_TRY_RUN called without default to
allow cross compiling|AC_PROG_CXXCPP was called before AC_PROG_CXX|defined in
acinclude.m4 but never used|AC_PROG_LEX invoked multiple times|AC_DECL_YYTEXT
is expanded from...|the top level)'||true)
all: $(targets)
@@ -45,7 +48,7 @@
# correctly otherwise (timestamps are not updated)
@echo rebuilding $@
@rm -f $@
- autoheader $(SUPPRESS_WARNINGS)
+ $(PHP_AUTOHEADER) $(SUPPRESS_WARNINGS)
$(TOUCH_FILES):
touch $(TOUCH_FILES)
@@ -56,5 +59,5 @@
configure: aclocal.m4 configure.in $(config_m4_files)
@echo rebuilding $@
- autoconf $(SUPPRESS_WARNINGS)
+ $(PHP_AUTOCONF) $(SUPPRESS_WARNINGS)
http://cvs.php.net/diff.php/php-src/build/buildcheck.sh?r1=1.34&r2=1.35&ty=u
Index: php-src/build/buildcheck.sh
diff -u php-src/build/buildcheck.sh:1.34 php-src/build/buildcheck.sh:1.35
--- php-src/build/buildcheck.sh:1.34 Wed Jan 19 20:41:19 2005
+++ php-src/build/buildcheck.sh Mon Apr 4 03:16:01 2005
@@ -16,15 +16,20 @@
# | Sascha Schumann <[EMAIL PROTECTED]> |
# +----------------------------------------------------------------------+
#
-# $Id: buildcheck.sh,v 1.34 2005/01/20 01:41:19 sniper Exp $
+# $Id: buildcheck.sh,v 1.35 2005/04/04 07:16:01 jon Exp $
#
echo "buildconf: checking installation..."
stamp=$1
+# Allow the autoconf executable to be overriden by $PHP_AUTOCONF.
+if test -z "$PHP_AUTOCONF"; then
+ PHP_AUTOCONF='autoconf'
+fi
+
# autoconf 2.13 or newer
-ac_version=`autoconf --version 2>/dev/null|head -n 1|sed -e 's/^[^0-9]*//' -e
's/[a-z]* *$//'`
+ac_version=`$PHP_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
