cvs: php-src(PHP_5_2) / Makefile.global acinclude.m4 buildconf configure.in run-tests.php /win32/build confutils.js
| From: | Jani Taskinen | Date: | Thu, 26 Jul 2007 22:45:59 +0000 |
| Subject: | cvs: php-src(PHP_5_2) / Makefile.global acinclude.m4 buildconf configure.in run-tests.php /win32/build confutils.js | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-45623@lists.php.net to get a copy of this message | ||
jani Thu Jul 26 22:45:59 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src Makefile.global acinclude.m4 buildconf configure.in
run-tests.php
/php-src/win32/build confutils.js
Log:
MFH: - Made build system less major version dependant to ease MFB/MFH
http://cvs.php.net/viewvc.cgi/php-src/Makefile.global?r1=1.57.2.5.2.12&r2=1.57.2.5.2.13&diff_format=u Index: php-src/Makefile.global diff -u php-src/Makefile.global:1.57.2.5.2.12 php-src/Makefile.global:1.57.2.5.2.13 --- php-src/Makefile.global:1.57.2.5.2.12 Tue Jul 3 15:56:21 2007 +++ php-src/Makefile.global Thu Jul 26 22:45:59 2007 @@ -13,22 +13,22 @@ build-modules: $(PHP_MODULES) -libphp5.la: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) +libphp$(PHP_MAJOR_VERSION).la: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ - -@$(LIBTOOL) --silent --mode=install cp libphp5.la $(phptempdir)/libphp5.la >/dev/null 2>&1 + -@$(LIBTOOL) --silent --mode=install cp $@ $(phptempdir)/$@ >/dev/null 2>&1 -libs/libphp5.bundle: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) - $(CC) $(MH_BUNDLE_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(PHP_GLOBAL_OBJS:.lo=.o) $(PHP_SAPI_OBJS:.lo=.o) $(PHP_FRAMEWORKS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ && cp $@ libs/libphp5.so +libs/libphp$(PHP_MAJOR_VERSION).bundle: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) + $(CC) $(MH_BUNDLE_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(PHP_GLOBAL_OBJS:.lo=.o) $(PHP_SAPI_OBJS:.lo=.o) $(PHP_FRAMEWORKS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ && cp $@ libs/libphp$(PHP_MAJOR_VERSION).so install: $(all_targets) $(install_targets) install-sapi: $(OVERALL_TARGET) @echo "Installing PHP SAPI module: $(PHP_SAPI)" -@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir) - -@if test ! -r $(phptempdir)/libphp5.$(SHLIB_DL_SUFFIX_NAME); then \ + -@if test ! -r $(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(SHLIB_DL_SUFFIX_NAME); then \ for i in 0.0.0 0.0 0; do \ - if test -r $(phptempdir)/libphp5.$(SHLIB_DL_SUFFIX_NAME).$$i; then \ - $(LN_S) $(phptempdir)/libphp5.$(SHLIB_DL_SUFFIX_NAME).$$i $(phptempdir)/libphp5.$(SHLIB_DL_SUFFIX_NAME); \ + if test -r $(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(SHLIB_DL_SUFFIX_NAME).$$i; then \ + $(LN_S) $(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(SHLIB_DL_SUFFIX_NAME).$$i $(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(SHLIB_DL_SUFFIX_NAME); \ break; \ fi; \ done; \ @@ -66,11 +66,9 @@ fi \ done; \ fi - -install-su: install-pear -PHP_TEST_SETTINGS = -d 'open_basedir=' -d 'safe_mode=0' -d 'output_buffering=0' -d 'memory_limit=-1' -PHP_TEST_SHARED_EXTENSIONS = ` \ +PHP_TEST_SETTINGS = -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1' +PHP_TEST_SHARED_EXTENSIONS = ` \ if test "$(PHP_MODULES)"; then \ for i in $(PHP_MODULES); do \ . $$i; $(top_srcdir)/build/shtool echo -n -- " -d extension=$$dlname"; \ @@ -82,7 +80,7 @@ TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \ TEST_PHP_SRCDIR=$(top_srcdir) \ CC="$(CC)" \ - $(PHP_EXECUTABLE) $(PHP_TEST_SETTINGS) $(top_srcdir)/run-tests.php -d extension_dir=modules/ $(PHP_TEST_SHARED_EXTENSIONS) tests/; \ + $(PHP_EXECUTABLE) $(PHP_TEST_SETTINGS) $(top_srcdir)/run-tests.php -U -d extension_dir=modules/ $(PHP_TEST_SHARED_EXTENSIONS) tests/; \ elif test ! -z "$(SAPI_CLI_PATH)" && test -x "$(SAPI_CLI_PATH)"; then \ INI_FILE=`$(top_builddir)/$(SAPI_CLI_PATH) -r 'echo php_ini_loaded_file();'`; \ if test "$$INI_FILE"; then \ @@ -93,7 +91,39 @@ TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \ TEST_PHP_SRCDIR=$(top_srcdir) \ CC="$(CC)" \ - $(top_builddir)/$(SAPI_CLI_PATH) $(PHP_TEST_SETTINGS) $(top_srcdir)/run-tests.php -c $(top_builddir)/tmp-php.ini -d extension_dir=$(top_builddir)/modules/ $(PHP_TEST_SHARED_EXTENSIONS) $(TESTS); \ + $(top_builddir)/$(SAPI_CLI_PATH) $(PHP_TEST_SETTINGS) $(top_srcdir)/run-tests.php -c $(top_builddir)/tmp-php.ini -U -d extension_dir=$(top_builddir)/modules/ $(PHP_TEST_SHARED_EXTENSIONS) $(TESTS); \ + else \ + echo "ERROR: Cannot run tests without CLI sapi."; \ + fi + +utest: all + -@if test ! -z "$(SAPI_CLI_PATH)" && test -x "$(SAPI_CLI_PATH)"; then \ + INI_FILE=`$(top_builddir)/$(SAPI_CLI_PATH) -r 'echo php_ini_loaded_file();'`; \ + if test "$$INI_FILE"; then \ + $(EGREP) -v '^extension[\t\ ]*=' "$$INI_FILE" > $(top_builddir)/tmp-php.ini; \ + else \ + echo > $(top_builddir)/tmp-php.ini; \ + fi; \ + TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \ + TEST_PHP_SRCDIR=$(top_srcdir) \ + CC="$(CC)" \ + $(top_builddir)/$(SAPI_CLI_PATH) $(PHP_TEST_SETTINGS) $(top_srcdir)/run-tests.php -c $(top_builddir)/tmp-php.ini -u -d extension_dir=$(top_builddir)/modules/ $(PHP_TEST_SHARED_EXTENSIONS) $(TESTS); \ + else \ + echo "ERROR: Cannot run tests without CLI sapi."; \ + fi + +ntest: all + -@if test ! -z "$(SAPI_CLI_PATH)" && test -x "$(SAPI_CLI_PATH)"; then \ + INI_FILE=`$(top_builddir)/$(SAPI_CLI_PATH) -r 'echo php_ini_loaded_file();'`; \ + if test "$$INI_FILE"; then \ + $(EGREP) -v '^extension[\t\ ]*=' "$$INI_FILE" > $(top_builddir)/tmp-php.ini; \ + else \ + echo > $(top_builddir)/tmp-php.ini; \ + fi; \ + TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \ + TEST_PHP_SRCDIR=$(top_srcdir) \ + CC="$(CC)" \ + $(top_builddir)/$(SAPI_CLI_PATH) $(PHP_TEST_SETTINGS) $(top_srcdir)/run-tests.php -c $(top_builddir)/tmp-php.ini -N -d extension_dir=$(top_builddir)/modules/ $(PHP_TEST_SHARED_EXTENSIONS) $(TESTS); \ else \ echo "ERROR: Cannot run tests without CLI sapi."; \ fi @@ -104,10 +134,10 @@ find . -name \*.la -o -name \*.a | xargs rm -f find . -name \*.so | xargs rm -f find . -name .libs -a -type d|xargs rm -rf - rm -f libphp5.la $(SAPI_CLI_PATH) $(OVERALL_TARGET) modules/* libs/* + rm -f libphp$(PHP_MAJOR_VERSION).la $(SAPI_CLI_PATH) $(OVERALL_TARGET) modules/* libs/* distclean: clean - rm -f config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h stamp-h php5.spec sapi/apache/libphp5.module buildmk.stamp + rm -f config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h stamp-h php5.spec sapi/apache/libphp$(PHP_MAJOR_VERSION).module buildmk.stamp $(EGREP) define'.*include/php' $(top_srcdir)/configure | $(SED) 's/.*>//'|xargs rm -f find . -name Makefile | xargs rm -f http://cvs.php.net/viewvc.cgi/php-src/acinclude.m4?r1=1.332.2.14.2.23&r2=1.332.2.14.2.24&diff_format=u Index: php-src/acinclude.m4 diff -u php-src/acinclude.m4:1.332.2.14.2.23 php-src/acinclude.m4:1.332.2.14.2.24 --- php-src/acinclude.m4:1.332.2.14.2.23 Wed Jul 25 22:49:39 2007 +++ php-src/acinclude.m4 Thu Jul 26 22:45:59 2007 @@ -1,5 +1,5 @@ dnl -dnl $Id: acinclude.m4,v 1.332.2.14.2.23 2007/07/25 22:49:39 jani Exp $ +dnl $Id: acinclude.m4,v 1.332.2.14.2.24 2007/07/26 22:45:59 jani Exp $ dnl dnl This file contains local autoconf functions. dnl @@ -773,7 +773,7 @@ dnl AC_DEFUN([PHP_BUILD_SHARED],[ PHP_BUILD_PROGRAM - OVERALL_TARGET=libphp5.la + OVERALL_TARGET=libphp[]$PHP_MAJOR_VERSION[.la] php_build_target=shared php_c_pre=$shared_c_pre @@ -790,7 +790,7 @@ dnl AC_DEFUN([PHP_BUILD_STATIC],[ PHP_BUILD_PROGRAM - OVERALL_TARGET=libphp5.la + OVERALL_TARGET=libphp[]$PHP_MAJOR_VERSION[.la] php_build_target=static ]) @@ -799,7 +799,7 @@ dnl AC_DEFUN([PHP_BUILD_BUNDLE],[ PHP_BUILD_PROGRAM - OVERALL_TARGET=libs/libphp5.bundle + OVERALL_TARGET=libs/libphp[]$PHP_MAJOR_VERSION[.bundle] php_build_target=static ]) @@ -1026,7 +1026,14 @@ dnl Checks for structures, typedefs, broken functions, etc. dnl ------------------------------------------------------------------------- -dnl Internal helper macro +dnl Internal helper macros +dnl +dnl _PHP_DEF_HAVE_FILE(what, filename) +AC_DEFUN([_PHP_DEF_HAVE_FILE], [ + php_def_have_what=HAVE_[]`echo $1 | tr 'abcdefghijklmnopqrstuvwxyz-' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_' ` + echo "#define $php_def_have_what 1" >> $2 +]) +dnl dnl _PHP_CHECK_SIZEOF(type, cross-value, extra-headers [, found-action [, not-found-action]]) dnl AC_DEFUN([_PHP_CHECK_SIZEOF], [ @@ -1085,6 +1092,21 @@ ]) dnl +dnl PHP_CHECK_TYPES(type-list, include-file [, extra-headers]) +dnl +AC_DEFUN([PHP_CHECK_TYPES], [ + for php_typename in $1; do + AC_MSG_CHECKING([whether $php_typename exists]) + _PHP_CHECK_SIZEOF($php_typename, 0, $3, [ + _PHP_DEF_HAVE_FILE($php_typename, $2) + AC_MSG_RESULT([yes]) + ], [ + AC_MSG_RESULT([no]) + ]) + done +]) + +dnl dnl PHP_CHECK_IN_ADDR_T dnl AC_DEFUN([PHP_CHECK_IN_ADDR_T], [ @@ -2062,11 +2084,14 @@ dnl Search for (f)lex and check it's version dnl AC_DEFUN([PHP_PROG_LEX], [ - # we only support certain flex versions +dnl we only support certain flex versions flex_version_list="2.5.4" AC_PROG_LEX if test "$LEX" = "flex"; then +dnl AC_DECL_YYTEXT is obsolete since autoconf 2.50 and merged into AC_PROG_LEX +dnl this is what causes that annoying "PHP_PROG_LEX is expanded from" warning with autoconf 2.50+ +dnl it should be removed once we drop support of autoconf 2.13 (if ever) AC_DECL_YYTEXT : fi @@ -2120,17 +2145,17 @@ AC_CHECK_PROG(RE2C, re2c, re2c) if test -n "$RE2C"; then AC_CACHE_CHECK([for re2c version], php_cv_re2c_version, [ - re2c_vernum=`echo "" | re2c --vernum 2>/dev/null` - if test -z "$re2c_vernum" || test "$re2c_vernum" -lt "911"; then + re2c_vernum=`re2c --vernum 2>/dev/null` + if test -z "$re2c_vernum" || test "$re2c_vernum" -lt "1200"; then php_cv_re2c_version=invalid else - php_cv_re2c_version="`echo "" | re2c --version | cut -d ' ' -f 2 2>/dev/null` (ok)" + php_cv_re2c_version="`re2c --version | cut -d ' ' -f 2 2>/dev/null` (ok)" fi ]) fi case $php_cv_re2c_version in ""|invalid[)] - AC_MSG_WARN([You will need re2c 0.9.11 or later if you want to regenerate PHP parsers.]) + AC_MSG_WARN([You will need re2c 0.12.0 or later if you want to regenerate PHP parsers.]) RE2C="exit 0;" ;; esac @@ -2142,6 +2167,57 @@ dnl ------------------------------------------------------------------------- dnl +dnl PHP_SETUP_ICU([shared-add]) +dnl +dnl Common setup macro for ICU +dnl +AC_DEFUN([PHP_SETUP_ICU],[ + PHP_ARG_WITH(icu-dir,, + [ --with-icu-dir=DIR Specify where ICU libraries and headers can be found], DEFAULT, no) + + if test "$PHP_ICU_DIR" = "no"; then + PHP_ICU_DIR=DEFAULT + fi + + if test "$PHP_ICU_DIR" = "DEFAULT"; then + dnl Try to find icu-config + AC_PATH_PROG(ICU_CONFIG, icu-config, no, [$PATH:/usr/local/bin]) + else + ICU_CONFIG="$PHP_ICU_DIR/bin/icu-config" + fi + + AC_MSG_CHECKING([for location of ICU headers and libraries]) + + dnl Trust icu-config to know better what the install prefix is.. + icu_install_prefix=`$ICU_CONFIG --prefix 2> /dev/null` + if test "$?" != "0" || test -z "$icu_install_prefix"; then + AC_MSG_RESULT([not found]) + AC_MSG_ERROR([Unable to detect ICU prefix or $ICU_CONFIG failed. Please verify ICU install prefix and make sure icu-config works.]) + else + AC_MSG_RESULT([$icu_install_prefix]) + + dnl Check ICU version + AC_MSG_CHECKING([for ICU 3.4 or greater]) + icu_version_full=`$ICU_CONFIG --version` + ac_IFS=$IFS + IFS="." + set $icu_version_full + IFS=$ac_IFS + icu_version=`expr [$]1 \* 1000 + [$]2` + AC_MSG_RESULT([found $icu_version_full]) + + if test "$icu_version" -lt "3004"; then + AC_MSG_ERROR([ICU version 3.4 or later is required]) + fi + + ICU_INCS=`$ICU_CONFIG --cppflags-searchpath` + ICU_LIBS=`$ICU_CONFIG --ldflags --ldflags-icuio` + PHP_EVAL_INCLINE($ICU_INCS) + PHP_EVAL_LIBLINE($ICU_LIBS, $1) + fi +]) + +dnl dnl PHP_SETUP_KERBEROS(shared-add [, action-found [, action-not-found]]) dnl dnl Common setup macro for kerberos @@ -2620,11 +2696,17 @@ with-tsrm-pth | with-tsrm-st | with-tsrm-pthreads[)];; # Allow certain Zend options - with-zend-vm | enable-maintainer-zts | enable-inline-optimization | enable-zend-multibyte[)];; + with-zend-vm | enable-maintainer-zts | enable-inline-optimization[)];; # All the rest must be set using the PHP_ARG_* macros # PHP_ARG_* macros set php_enable_<arg_name> or php_with_<arg_name> *[)] + # Options that exist before PHP 6 + if test "$PHP_MAJOR_VERSION" -lt "6"; then + case $arg_name in + enable-zend-multibyte[)] continue;; + esac + fi is_arg_set=php_[]`echo [$]arg_name | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ-' 'abcdefghijklmnopqrstuvwxyz_'` if eval test -z "\$$is_arg_set"; then PHP_UNKNOWN_CONFIGURE_OPTIONS="$PHP_UNKNOWN_CONFIGURE_OPTIONS http://cvs.php.net/viewvc.cgi/php-src/buildconf?r1=1.64.2.1&r2=1.64.2.1.2.1&diff_format=u Index: php-src/buildconf diff -u php-src/buildconf:1.64.2.1 php-src/buildconf:1.64.2.1.2.1 --- php-src/buildconf:1.64.2.1 Tue Nov 29 22:39:19 2005 +++ php-src/buildconf Thu Jul 26 22:45:59 2007 @@ -1,8 +1,8 @@ #!/bin/sh -# $Id: buildconf,v 1.64.2.1 2005/11/29 22:39:19 sniper Exp $ +# $Id: buildconf,v 1.64.2.1.2.1 2007/07/26 22:45:59 jani Exp $ -eval `grep '^EXTRA_VERSION=' configure.in` -case "$EXTRA_VERSION" in +eval `grep '^PHP_EXTRA_VERSION=' configure.in` +case "$PHP_EXTRA_VERSION" in *-dev) dev=1 ;; http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.65&r2=1.579.2.52.2.66&diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.579.2.52.2.65 php-src/configure.in:1.579.2.52.2.66 --- php-src/configure.in:1.579.2.52.2.65 Thu Jul 12 11:33:37 2007 +++ php-src/configure.in Thu Jul 26 22:45:59 2007 @@ -1,4 +1,4 @@ -## $Id: configure.in,v 1.579.2.52.2.65 2007/07/12 11:33:37 jani Exp $ -*- autoconf -*- +## $Id: configure.in,v 1.579.2.52.2.66 2007/07/26 22:45:59 jani Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -39,12 +39,18 @@ AC_CONFIG_HEADER(main/php_config.h) -MAJOR_VERSION=5 -MINOR_VERSION=2 -RELEASE_VERSION=4 -EXTRA_VERSION="-dev" -PHP_VERSION="$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION" -PHP_VERSION_ID=`expr [$]MAJOR_VERSION \* 10000 + [$]MINOR_VERSION \* 100 + [$]RELEASE_VERSION` +PHP_MAJOR_VERSION=5 +PHP_MINOR_VERSION=2 +PHP_RELEASE_VERSION=4 +PHP_EXTRA_VERSION="-dev" +PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION" +PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 10000 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION` + +dnl Allow version values to be used in Makefile +PHP_SUBST(PHP_MAJOR_VERSION) +PHP_SUBST(PHP_MINOR_VERSION) +PHP_SUBST(PHP_RELEASE_VERSION) +PHP_SUBST(PHP_EXTRA_VERSION) dnl Define where extension directories are located in the configure context AC_DEFUN([PHP_EXT_BUILDDIR],[ext/$1])dnl @@ -57,10 +63,10 @@ echo "/* automatically generated by configure */" > php_version.h.new echo "/* edit configure.in to change version number */" >> php_version.h.new -echo "#define PHP_MAJOR_VERSION $MAJOR_VERSION" >> php_version.h.new -echo "#define PHP_MINOR_VERSION $MINOR_VERSION" >> php_version.h.new -echo "#define PHP_RELEASE_VERSION $RELEASE_VERSION" >> php_version.h.new -echo "#define PHP_EXTRA_VERSION \"$EXTRA_VERSION\"" >> php_version.h.new +echo "#define PHP_MAJOR_VERSION $PHP_MAJOR_VERSION" >> php_version.h.new +echo "#define PHP_MINOR_VERSION $PHP_MINOR_VERSION" >> php_version.h.new +echo "#define PHP_RELEASE_VERSION $PHP_RELEASE_VERSION" >> php_version.h.new +echo "#define PHP_EXTRA_VERSION \"$PHP_EXTRA_VERSION\"" >> php_version.h.new echo "#define PHP_VERSION \"$PHP_VERSION\"" >> php_version.h.new echo "#define PHP_VERSION_ID $PHP_VERSION_ID" >> php_version.h.new cmp php_version.h.new $srcdir/main/php_version.h >/dev/null 2>&1 @@ -188,7 +194,7 @@ PHP_ADD_SOURCES(/main, internal_functions.c,,PHP_GLOBAL_OBJS) PHP_ADD_SOURCES(win32, sendmail.c, -I$CFLAGS, PHP_GLOBAL_OBJS) PHP5LIB_SHARED_LIBADD=\$\(EXTRA_LIBS\) - EXTENSION_DIR=sys:/php$MAJOR_VERSION/ext + EXTENSION_DIR=sys:/php$PHP_MAJOR_VERSION/ext PHP_SUBST(PHP5LIB_SHARED_LIBADD) PHP_SHARED_MODULE(php5lib, PHP_GLOBAL_OBJS, netware) ;; @@ -240,9 +246,9 @@ dnl ------------------------------------------------------------------------- dnl paths to the targets are relative to the build directory -SAPI_SHARED=libs/libphp5.$SHLIB_DL_SUFFIX_NAME -SAPI_STATIC=libs/libphp5.a -SAPI_LIBTOOL=libphp5.la +SAPI_SHARED=libs/libphp[]$PHP_MAJOR_VERSION[.]$SHLIB_DL_SUFFIX_NAME +SAPI_STATIC=libs/libphp[]$PHP_MAJOR_VERSION[.a] +SAPI_LIBTOOL=libphp[]$PHP_MAJOR_VERSION[.la] PHP_CONFIGURE_PART(Configuring SAPI modules) http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.32&r2=1.226.2.37.2.33&diff_format=u Index: php-src/run-tests.php diff -u php-src/run-tests.php:1.226.2.37.2.32 php-src/run-tests.php:1.226.2.37.2.33 --- php-src/run-tests.php:1.226.2.37.2.32 Wed Jul 4 10:16:22 2007 +++ php-src/run-tests.php Thu Jul 26 22:45:59 2007 @@ -23,7 +23,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: run-tests.php,v 1.226.2.37.2.32 2007/07/04 10:16:22 dmitry Exp $ */ +/* $Id: run-tests.php,v 1.226.2.37.2.33 2007/07/26 22:45:59 jani Exp $ */ /* Sanity check to ensure that pcre extension needed by this script is available. * In the event it is not, print a nice error message indicating that this script will @@ -399,14 +399,16 @@ $html_output = is_resource($html_file); break; case '--version': - echo '$Revision: 1.226.2.37.2.32 $'."\n"; + echo '$Revision: 1.226.2.37.2.33 $'."\n"; exit(1); + + case 'u': + case 'U': + // Allow using u or U for forward compatibility + break; + default: echo "Illegal switch '$switch' specified!\n"; - if ($switch == 'u' || $switch == 'U') { - break; - } - // break case 'h': case '-help': case '--help': http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.60.2.1.2.7&r2=1.60.2.1.2.8&diff_format=u Index: php-src/win32/build/confutils.js diff -u php-src/win32/build/confutils.js:1.60.2.1.2.7 php-src/win32/build/confutils.js:1.60.2.1.2.8 --- php-src/win32/build/confutils.js:1.60.2.1.2.7 Sat Jul 21 11:24:53 2007 +++ php-src/win32/build/confutils.js Thu Jul 26 22:45:59 2007 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -// $Id: confutils.js,v 1.60.2.1.2.7 2007/07/21 11:24:53 derick Exp $ +// $Id: confutils.js,v 1.60.2.1.2.8 2007/07/26 22:45:59 jani Exp $ var STDOUT = WScript.StdOut; var STDERR = WScript.StdErr; @@ -53,18 +53,18 @@ { var cin = file_get_contents("configure.in"); - if (cin.match(new RegExp("MAJOR_VERSION=(\\d+)"))) { + if (cin.match(new RegExp("PHP_MAJOR_VERSION=(\\d+)"))) { PHP_VERSION = RegExp.$1; } - if (cin.match(new RegExp("MINOR_VERSION=(\\d+)"))) { + if (cin.match(new RegExp("PHP_MINOR_VERSION=(\\d+)"))) { PHP_MINOR_VERSION = RegExp.$1; } - if (cin.match(new RegExp("RELEASE_VERSION=(\\d+)"))) { + if (cin.match(new RegExp("PHP_RELEASE_VERSION=(\\d+)"))) { PHP_RELEASE_VERSION = RegExp.$1; } PHP_VERSION_STRING = PHP_VERSION + "." + PHP_MINOR_VERSION + "." + PHP_RELEASE_VERSION; - if (cin.match(new RegExp("EXTRA_VERSION=\"([^\"]+)\""))) { + if (cin.match(new RegExp("PHP_EXTRA_VERSION=\"([^\"]+)\""))) { PHP_EXTRA_VERSION = RegExp.$1; if (PHP_EXTRA_VERSION.length) { PHP_VERSION_STRING += PHP_EXTRA_VERSION;
http://cvs.php.net/viewvc.cgi/php-src/Makefile.global?r1=1.57.2.5.2.12&r2=1.57.2.5.2.13&diff_format=u Index: php-src/Makefile.global diff -u php-src/Makefile.global:1.57.2.5.2.12 php-src/Makefile.global:1.57.2.5.2.13 --- php-src/Makefile.global:1.57.2.5.2.12 Tue Jul 3 15:56:21 2007 +++ php-src/Makefile.global Thu Jul 26 22:45:59 2007 @@ -13,22 +13,22 @@ build-modules: $(PHP_MODULES) -libphp5.la: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) +libphp$(PHP_MAJOR_VERSION).la: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS) $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ - -@$(LIBTOOL) --silent --mode=install cp libphp5.la $(phptempdir)/libphp5.la >/dev/null 2>&1 + -@$(LIBTOOL) --silent --mode=install cp $@ $(phptempdir)/$@ >/dev/null 2>&1 -libs/libphp5.bundle: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) - $(CC) $(MH_BUNDLE_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(PHP_GLOBAL_OBJS:.lo=.o) $(PHP_SAPI_OBJS:.lo=.o) $(PHP_FRAMEWORKS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ && cp $@ libs/libphp5.so +libs/libphp$(PHP_MAJOR_VERSION).bundle: $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) + $(CC) $(MH_BUNDLE_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) $(EXTRA_LDFLAGS) $(PHP_GLOBAL_OBJS:.lo=.o) $(PHP_SAPI_OBJS:.lo=.o) $(PHP_FRAMEWORKS) $(EXTRA_LIBS) $(ZEND_EXTRA_LIBS) -o $@ && cp $@ libs/libphp$(PHP_MAJOR_VERSION).so install: $(all_targets) $(install_targets) install-sapi: $(OVERALL_TARGET) @echo "Installing PHP SAPI module: $(PHP_SAPI)" -@$(mkinstalldirs) $(INSTALL_ROOT)$(bindir) - -@if test ! -r $(phptempdir)/libphp5.$(SHLIB_DL_SUFFIX_NAME); then \ + -@if test ! -r $(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(SHLIB_DL_SUFFIX_NAME); then \ for i in 0.0.0 0.0 0; do \ - if test -r $(phptempdir)/libphp5.$(SHLIB_DL_SUFFIX_NAME).$$i; then \ - $(LN_S) $(phptempdir)/libphp5.$(SHLIB_DL_SUFFIX_NAME).$$i $(phptempdir)/libphp5.$(SHLIB_DL_SUFFIX_NAME); \ + if test -r $(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(SHLIB_DL_SUFFIX_NAME).$$i; then \ + $(LN_S) $(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(SHLIB_DL_SUFFIX_NAME).$$i $(phptempdir)/libphp$(PHP_MAJOR_VERSION).$(SHLIB_DL_SUFFIX_NAME); \ break; \ fi; \ done; \ @@ -66,11 +66,9 @@ fi \ done; \ fi - -install-su: install-pear -PHP_TEST_SETTINGS = -d 'open_basedir=' -d 'safe_mode=0' -d 'output_buffering=0' -d 'memory_limit=-1' -PHP_TEST_SHARED_EXTENSIONS = ` \ +PHP_TEST_SETTINGS = -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1' +PHP_TEST_SHARED_EXTENSIONS = ` \ if test "$(PHP_MODULES)"; then \ for i in $(PHP_MODULES); do \ . $$i; $(top_srcdir)/build/shtool echo -n -- " -d extension=$$dlname"; \ @@ -82,7 +80,7 @@ TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \ TEST_PHP_SRCDIR=$(top_srcdir) \ CC="$(CC)" \ - $(PHP_EXECUTABLE) $(PHP_TEST_SETTINGS) $(top_srcdir)/run-tests.php -d extension_dir=modules/ $(PHP_TEST_SHARED_EXTENSIONS) tests/; \ + $(PHP_EXECUTABLE) $(PHP_TEST_SETTINGS) $(top_srcdir)/run-tests.php -U -d extension_dir=modules/ $(PHP_TEST_SHARED_EXTENSIONS) tests/; \ elif test ! -z "$(SAPI_CLI_PATH)" && test -x "$(SAPI_CLI_PATH)"; then \ INI_FILE=`$(top_builddir)/$(SAPI_CLI_PATH) -r 'echo php_ini_loaded_file();'`; \ if test "$$INI_FILE"; then \ @@ -93,7 +91,39 @@ TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \ TEST_PHP_SRCDIR=$(top_srcdir) \ CC="$(CC)" \ - $(top_builddir)/$(SAPI_CLI_PATH) $(PHP_TEST_SETTINGS) $(top_srcdir)/run-tests.php -c $(top_builddir)/tmp-php.ini -d extension_dir=$(top_builddir)/modules/ $(PHP_TEST_SHARED_EXTENSIONS) $(TESTS); \ + $(top_builddir)/$(SAPI_CLI_PATH) $(PHP_TEST_SETTINGS) $(top_srcdir)/run-tests.php -c $(top_builddir)/tmp-php.ini -U -d extension_dir=$(top_builddir)/modules/ $(PHP_TEST_SHARED_EXTENSIONS) $(TESTS); \ + else \ + echo "ERROR: Cannot run tests without CLI sapi."; \ + fi + +utest: all + -@if test ! -z "$(SAPI_CLI_PATH)" && test -x "$(SAPI_CLI_PATH)"; then \ + INI_FILE=`$(top_builddir)/$(SAPI_CLI_PATH) -r 'echo php_ini_loaded_file();'`; \ + if test "$$INI_FILE"; then \ + $(EGREP) -v '^extension[\t\ ]*=' "$$INI_FILE" > $(top_builddir)/tmp-php.ini; \ + else \ + echo > $(top_builddir)/tmp-php.ini; \ + fi; \ + TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \ + TEST_PHP_SRCDIR=$(top_srcdir) \ + CC="$(CC)" \ + $(top_builddir)/$(SAPI_CLI_PATH) $(PHP_TEST_SETTINGS) $(top_srcdir)/run-tests.php -c $(top_builddir)/tmp-php.ini -u -d extension_dir=$(top_builddir)/modules/ $(PHP_TEST_SHARED_EXTENSIONS) $(TESTS); \ + else \ + echo "ERROR: Cannot run tests without CLI sapi."; \ + fi + +ntest: all + -@if test ! -z "$(SAPI_CLI_PATH)" && test -x "$(SAPI_CLI_PATH)"; then \ + INI_FILE=`$(top_builddir)/$(SAPI_CLI_PATH) -r 'echo php_ini_loaded_file();'`; \ + if test "$$INI_FILE"; then \ + $(EGREP) -v '^extension[\t\ ]*=' "$$INI_FILE" > $(top_builddir)/tmp-php.ini; \ + else \ + echo > $(top_builddir)/tmp-php.ini; \ + fi; \ + TEST_PHP_EXECUTABLE=$(top_builddir)/$(SAPI_CLI_PATH) \ + TEST_PHP_SRCDIR=$(top_srcdir) \ + CC="$(CC)" \ + $(top_builddir)/$(SAPI_CLI_PATH) $(PHP_TEST_SETTINGS) $(top_srcdir)/run-tests.php -c $(top_builddir)/tmp-php.ini -N -d extension_dir=$(top_builddir)/modules/ $(PHP_TEST_SHARED_EXTENSIONS) $(TESTS); \ else \ echo "ERROR: Cannot run tests without CLI sapi."; \ fi @@ -104,10 +134,10 @@ find . -name \*.la -o -name \*.a | xargs rm -f find . -name \*.so | xargs rm -f find . -name .libs -a -type d|xargs rm -rf - rm -f libphp5.la $(SAPI_CLI_PATH) $(OVERALL_TARGET) modules/* libs/* + rm -f libphp$(PHP_MAJOR_VERSION).la $(SAPI_CLI_PATH) $(OVERALL_TARGET) modules/* libs/* distclean: clean - rm -f config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h stamp-h php5.spec sapi/apache/libphp5.module buildmk.stamp + rm -f config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h stamp-h php5.spec sapi/apache/libphp$(PHP_MAJOR_VERSION).module buildmk.stamp $(EGREP) define'.*include/php' $(top_srcdir)/configure | $(SED) 's/.*>//'|xargs rm -f find . -name Makefile | xargs rm -f http://cvs.php.net/viewvc.cgi/php-src/acinclude.m4?r1=1.332.2.14.2.23&r2=1.332.2.14.2.24&diff_format=u Index: php-src/acinclude.m4 diff -u php-src/acinclude.m4:1.332.2.14.2.23 php-src/acinclude.m4:1.332.2.14.2.24 --- php-src/acinclude.m4:1.332.2.14.2.23 Wed Jul 25 22:49:39 2007 +++ php-src/acinclude.m4 Thu Jul 26 22:45:59 2007 @@ -1,5 +1,5 @@ dnl -dnl $Id: acinclude.m4,v 1.332.2.14.2.23 2007/07/25 22:49:39 jani Exp $ +dnl $Id: acinclude.m4,v 1.332.2.14.2.24 2007/07/26 22:45:59 jani Exp $ dnl dnl This file contains local autoconf functions. dnl @@ -773,7 +773,7 @@ dnl AC_DEFUN([PHP_BUILD_SHARED],[ PHP_BUILD_PROGRAM - OVERALL_TARGET=libphp5.la + OVERALL_TARGET=libphp[]$PHP_MAJOR_VERSION[.la] php_build_target=shared php_c_pre=$shared_c_pre @@ -790,7 +790,7 @@ dnl AC_DEFUN([PHP_BUILD_STATIC],[ PHP_BUILD_PROGRAM - OVERALL_TARGET=libphp5.la + OVERALL_TARGET=libphp[]$PHP_MAJOR_VERSION[.la] php_build_target=static ]) @@ -799,7 +799,7 @@ dnl AC_DEFUN([PHP_BUILD_BUNDLE],[ PHP_BUILD_PROGRAM - OVERALL_TARGET=libs/libphp5.bundle + OVERALL_TARGET=libs/libphp[]$PHP_MAJOR_VERSION[.bundle] php_build_target=static ]) @@ -1026,7 +1026,14 @@ dnl Checks for structures, typedefs, broken functions, etc. dnl ------------------------------------------------------------------------- -dnl Internal helper macro +dnl Internal helper macros +dnl +dnl _PHP_DEF_HAVE_FILE(what, filename) +AC_DEFUN([_PHP_DEF_HAVE_FILE], [ + php_def_have_what=HAVE_[]`echo $1 | tr 'abcdefghijklmnopqrstuvwxyz-' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_' ` + echo "#define $php_def_have_what 1" >> $2 +]) +dnl dnl _PHP_CHECK_SIZEOF(type, cross-value, extra-headers [, found-action [, not-found-action]]) dnl AC_DEFUN([_PHP_CHECK_SIZEOF], [ @@ -1085,6 +1092,21 @@ ]) dnl +dnl PHP_CHECK_TYPES(type-list, include-file [, extra-headers]) +dnl +AC_DEFUN([PHP_CHECK_TYPES], [ + for php_typename in $1; do + AC_MSG_CHECKING([whether $php_typename exists]) + _PHP_CHECK_SIZEOF($php_typename, 0, $3, [ + _PHP_DEF_HAVE_FILE($php_typename, $2) + AC_MSG_RESULT([yes]) + ], [ + AC_MSG_RESULT([no]) + ]) + done +]) + +dnl dnl PHP_CHECK_IN_ADDR_T dnl AC_DEFUN([PHP_CHECK_IN_ADDR_T], [ @@ -2062,11 +2084,14 @@ dnl Search for (f)lex and check it's version dnl AC_DEFUN([PHP_PROG_LEX], [ - # we only support certain flex versions +dnl we only support certain flex versions flex_version_list="2.5.4" AC_PROG_LEX if test "$LEX" = "flex"; then +dnl AC_DECL_YYTEXT is obsolete since autoconf 2.50 and merged into AC_PROG_LEX +dnl this is what causes that annoying "PHP_PROG_LEX is expanded from" warning with autoconf 2.50+ +dnl it should be removed once we drop support of autoconf 2.13 (if ever) AC_DECL_YYTEXT : fi @@ -2120,17 +2145,17 @@ AC_CHECK_PROG(RE2C, re2c, re2c) if test -n "$RE2C"; then AC_CACHE_CHECK([for re2c version], php_cv_re2c_version, [ - re2c_vernum=`echo "" | re2c --vernum 2>/dev/null` - if test -z "$re2c_vernum" || test "$re2c_vernum" -lt "911"; then + re2c_vernum=`re2c --vernum 2>/dev/null` + if test -z "$re2c_vernum" || test "$re2c_vernum" -lt "1200"; then php_cv_re2c_version=invalid else - php_cv_re2c_version="`echo "" | re2c --version | cut -d ' ' -f 2 2>/dev/null` (ok)" + php_cv_re2c_version="`re2c --version | cut -d ' ' -f 2 2>/dev/null` (ok)" fi ]) fi case $php_cv_re2c_version in ""|invalid[)] - AC_MSG_WARN([You will need re2c 0.9.11 or later if you want to regenerate PHP parsers.]) + AC_MSG_WARN([You will need re2c 0.12.0 or later if you want to regenerate PHP parsers.]) RE2C="exit 0;" ;; esac @@ -2142,6 +2167,57 @@ dnl ------------------------------------------------------------------------- dnl +dnl PHP_SETUP_ICU([shared-add]) +dnl +dnl Common setup macro for ICU +dnl +AC_DEFUN([PHP_SETUP_ICU],[ + PHP_ARG_WITH(icu-dir,, + [ --with-icu-dir=DIR Specify where ICU libraries and headers can be found], DEFAULT, no) + + if test "$PHP_ICU_DIR" = "no"; then + PHP_ICU_DIR=DEFAULT + fi + + if test "$PHP_ICU_DIR" = "DEFAULT"; then + dnl Try to find icu-config + AC_PATH_PROG(ICU_CONFIG, icu-config, no, [$PATH:/usr/local/bin]) + else + ICU_CONFIG="$PHP_ICU_DIR/bin/icu-config" + fi + + AC_MSG_CHECKING([for location of ICU headers and libraries]) + + dnl Trust icu-config to know better what the install prefix is.. + icu_install_prefix=`$ICU_CONFIG --prefix 2> /dev/null` + if test "$?" != "0" || test -z "$icu_install_prefix"; then + AC_MSG_RESULT([not found]) + AC_MSG_ERROR([Unable to detect ICU prefix or $ICU_CONFIG failed. Please verify ICU install prefix and make sure icu-config works.]) + else + AC_MSG_RESULT([$icu_install_prefix]) + + dnl Check ICU version + AC_MSG_CHECKING([for ICU 3.4 or greater]) + icu_version_full=`$ICU_CONFIG --version` + ac_IFS=$IFS + IFS="." + set $icu_version_full + IFS=$ac_IFS + icu_version=`expr [$]1 \* 1000 + [$]2` + AC_MSG_RESULT([found $icu_version_full]) + + if test "$icu_version" -lt "3004"; then + AC_MSG_ERROR([ICU version 3.4 or later is required]) + fi + + ICU_INCS=`$ICU_CONFIG --cppflags-searchpath` + ICU_LIBS=`$ICU_CONFIG --ldflags --ldflags-icuio` + PHP_EVAL_INCLINE($ICU_INCS) + PHP_EVAL_LIBLINE($ICU_LIBS, $1) + fi +]) + +dnl dnl PHP_SETUP_KERBEROS(shared-add [, action-found [, action-not-found]]) dnl dnl Common setup macro for kerberos @@ -2620,11 +2696,17 @@ with-tsrm-pth | with-tsrm-st | with-tsrm-pthreads[)];; # Allow certain Zend options - with-zend-vm | enable-maintainer-zts | enable-inline-optimization | enable-zend-multibyte[)];; + with-zend-vm | enable-maintainer-zts | enable-inline-optimization[)];; # All the rest must be set using the PHP_ARG_* macros # PHP_ARG_* macros set php_enable_<arg_name> or php_with_<arg_name> *[)] + # Options that exist before PHP 6 + if test "$PHP_MAJOR_VERSION" -lt "6"; then + case $arg_name in + enable-zend-multibyte[)] continue;; + esac + fi is_arg_set=php_[]`echo [$]arg_name | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ-' 'abcdefghijklmnopqrstuvwxyz_'` if eval test -z "\$$is_arg_set"; then PHP_UNKNOWN_CONFIGURE_OPTIONS="$PHP_UNKNOWN_CONFIGURE_OPTIONS http://cvs.php.net/viewvc.cgi/php-src/buildconf?r1=1.64.2.1&r2=1.64.2.1.2.1&diff_format=u Index: php-src/buildconf diff -u php-src/buildconf:1.64.2.1 php-src/buildconf:1.64.2.1.2.1 --- php-src/buildconf:1.64.2.1 Tue Nov 29 22:39:19 2005 +++ php-src/buildconf Thu Jul 26 22:45:59 2007 @@ -1,8 +1,8 @@ #!/bin/sh -# $Id: buildconf,v 1.64.2.1 2005/11/29 22:39:19 sniper Exp $ +# $Id: buildconf,v 1.64.2.1.2.1 2007/07/26 22:45:59 jani Exp $ -eval `grep '^EXTRA_VERSION=' configure.in` -case "$EXTRA_VERSION" in +eval `grep '^PHP_EXTRA_VERSION=' configure.in` +case "$PHP_EXTRA_VERSION" in *-dev) dev=1 ;; http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.579.2.52.2.65&r2=1.579.2.52.2.66&diff_format=u Index: php-src/configure.in diff -u php-src/configure.in:1.579.2.52.2.65 php-src/configure.in:1.579.2.52.2.66 --- php-src/configure.in:1.579.2.52.2.65 Thu Jul 12 11:33:37 2007 +++ php-src/configure.in Thu Jul 26 22:45:59 2007 @@ -1,4 +1,4 @@ -## $Id: configure.in,v 1.579.2.52.2.65 2007/07/12 11:33:37 jani Exp $ -*- autoconf -*- +## $Id: configure.in,v 1.579.2.52.2.66 2007/07/26 22:45:59 jani Exp $ -*- autoconf -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -39,12 +39,18 @@ AC_CONFIG_HEADER(main/php_config.h) -MAJOR_VERSION=5 -MINOR_VERSION=2 -RELEASE_VERSION=4 -EXTRA_VERSION="-dev" -PHP_VERSION="$MAJOR_VERSION.$MINOR_VERSION.$RELEASE_VERSION$EXTRA_VERSION" -PHP_VERSION_ID=`expr [$]MAJOR_VERSION \* 10000 + [$]MINOR_VERSION \* 100 + [$]RELEASE_VERSION` +PHP_MAJOR_VERSION=5 +PHP_MINOR_VERSION=2 +PHP_RELEASE_VERSION=4 +PHP_EXTRA_VERSION="-dev" +PHP_VERSION="$PHP_MAJOR_VERSION.$PHP_MINOR_VERSION.$PHP_RELEASE_VERSION$PHP_EXTRA_VERSION" +PHP_VERSION_ID=`expr [$]PHP_MAJOR_VERSION \* 10000 + [$]PHP_MINOR_VERSION \* 100 + [$]PHP_RELEASE_VERSION` + +dnl Allow version values to be used in Makefile +PHP_SUBST(PHP_MAJOR_VERSION) +PHP_SUBST(PHP_MINOR_VERSION) +PHP_SUBST(PHP_RELEASE_VERSION) +PHP_SUBST(PHP_EXTRA_VERSION) dnl Define where extension directories are located in the configure context AC_DEFUN([PHP_EXT_BUILDDIR],[ext/$1])dnl @@ -57,10 +63,10 @@ echo "/* automatically generated by configure */" > php_version.h.new echo "/* edit configure.in to change version number */" >> php_version.h.new -echo "#define PHP_MAJOR_VERSION $MAJOR_VERSION" >> php_version.h.new -echo "#define PHP_MINOR_VERSION $MINOR_VERSION" >> php_version.h.new -echo "#define PHP_RELEASE_VERSION $RELEASE_VERSION" >> php_version.h.new -echo "#define PHP_EXTRA_VERSION \"$EXTRA_VERSION\"" >> php_version.h.new +echo "#define PHP_MAJOR_VERSION $PHP_MAJOR_VERSION" >> php_version.h.new +echo "#define PHP_MINOR_VERSION $PHP_MINOR_VERSION" >> php_version.h.new +echo "#define PHP_RELEASE_VERSION $PHP_RELEASE_VERSION" >> php_version.h.new +echo "#define PHP_EXTRA_VERSION \"$PHP_EXTRA_VERSION\"" >> php_version.h.new echo "#define PHP_VERSION \"$PHP_VERSION\"" >> php_version.h.new echo "#define PHP_VERSION_ID $PHP_VERSION_ID" >> php_version.h.new cmp php_version.h.new $srcdir/main/php_version.h >/dev/null 2>&1 @@ -188,7 +194,7 @@ PHP_ADD_SOURCES(/main, internal_functions.c,,PHP_GLOBAL_OBJS) PHP_ADD_SOURCES(win32, sendmail.c, -I$CFLAGS, PHP_GLOBAL_OBJS) PHP5LIB_SHARED_LIBADD=\$\(EXTRA_LIBS\) - EXTENSION_DIR=sys:/php$MAJOR_VERSION/ext + EXTENSION_DIR=sys:/php$PHP_MAJOR_VERSION/ext PHP_SUBST(PHP5LIB_SHARED_LIBADD) PHP_SHARED_MODULE(php5lib, PHP_GLOBAL_OBJS, netware) ;; @@ -240,9 +246,9 @@ dnl ------------------------------------------------------------------------- dnl paths to the targets are relative to the build directory -SAPI_SHARED=libs/libphp5.$SHLIB_DL_SUFFIX_NAME -SAPI_STATIC=libs/libphp5.a -SAPI_LIBTOOL=libphp5.la +SAPI_SHARED=libs/libphp[]$PHP_MAJOR_VERSION[.]$SHLIB_DL_SUFFIX_NAME +SAPI_STATIC=libs/libphp[]$PHP_MAJOR_VERSION[.a] +SAPI_LIBTOOL=libphp[]$PHP_MAJOR_VERSION[.la] PHP_CONFIGURE_PART(Configuring SAPI modules) http://cvs.php.net/viewvc.cgi/php-src/run-tests.php?r1=1.226.2.37.2.32&r2=1.226.2.37.2.33&diff_format=u Index: php-src/run-tests.php diff -u php-src/run-tests.php:1.226.2.37.2.32 php-src/run-tests.php:1.226.2.37.2.33 --- php-src/run-tests.php:1.226.2.37.2.32 Wed Jul 4 10:16:22 2007 +++ php-src/run-tests.php Thu Jul 26 22:45:59 2007 @@ -23,7 +23,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: run-tests.php,v 1.226.2.37.2.32 2007/07/04 10:16:22 dmitry Exp $ */ +/* $Id: run-tests.php,v 1.226.2.37.2.33 2007/07/26 22:45:59 jani Exp $ */ /* Sanity check to ensure that pcre extension needed by this script is available. * In the event it is not, print a nice error message indicating that this script will @@ -399,14 +399,16 @@ $html_output = is_resource($html_file); break; case '--version': - echo '$Revision: 1.226.2.37.2.32 $'."\n"; + echo '$Revision: 1.226.2.37.2.33 $'."\n"; exit(1); + + case 'u': + case 'U': + // Allow using u or U for forward compatibility + break; + default: echo "Illegal switch '$switch' specified!\n"; - if ($switch == 'u' || $switch == 'U') { - break; - } - // break case 'h': case '-help': case '--help': http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.60.2.1.2.7&r2=1.60.2.1.2.8&diff_format=u Index: php-src/win32/build/confutils.js diff -u php-src/win32/build/confutils.js:1.60.2.1.2.7 php-src/win32/build/confutils.js:1.60.2.1.2.8 --- php-src/win32/build/confutils.js:1.60.2.1.2.7 Sat Jul 21 11:24:53 2007 +++ php-src/win32/build/confutils.js Thu Jul 26 22:45:59 2007 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -// $Id: confutils.js,v 1.60.2.1.2.7 2007/07/21 11:24:53 derick Exp $ +// $Id: confutils.js,v 1.60.2.1.2.8 2007/07/26 22:45:59 jani Exp $ var STDOUT = WScript.StdOut; var STDERR = WScript.StdErr; @@ -53,18 +53,18 @@ { var cin = file_get_contents("configure.in"); - if (cin.match(new RegExp("MAJOR_VERSION=(\\d+)"))) { + if (cin.match(new RegExp("PHP_MAJOR_VERSION=(\\d+)"))) { PHP_VERSION = RegExp.$1; } - if (cin.match(new RegExp("MINOR_VERSION=(\\d+)"))) { + if (cin.match(new RegExp("PHP_MINOR_VERSION=(\\d+)"))) { PHP_MINOR_VERSION = RegExp.$1; } - if (cin.match(new RegExp("RELEASE_VERSION=(\\d+)"))) { + if (cin.match(new RegExp("PHP_RELEASE_VERSION=(\\d+)"))) { PHP_RELEASE_VERSION = RegExp.$1; } PHP_VERSION_STRING = PHP_VERSION + "." + PHP_MINOR_VERSION + "." + PHP_RELEASE_VERSION; - if (cin.match(new RegExp("EXTRA_VERSION=\"([^\"]+)\""))) { + if (cin.match(new RegExp("PHP_EXTRA_VERSION=\"([^\"]+)\""))) { PHP_EXTRA_VERSION = RegExp.$1; if (PHP_EXTRA_VERSION.length) { PHP_VERSION_STRING += PHP_EXTRA_VERSION;