diff options
| -rw-r--r-- | Makefile.global | 18 | ||||
| -rw-r--r-- | acinclude.m4 | 12 | ||||
| -rwxr-xr-x | buildconf | 4 | ||||
| -rw-r--r-- | configure.in | 34 | ||||
| -rw-r--r-- | win32/build/confutils.js | 10 |
5 files changed, 45 insertions, 33 deletions
diff --git a/Makefile.global b/Makefile.global index 401b1b9969..3457c7809c 100644 --- a/Makefile.global +++ b/Makefile.global @@ -13,22 +13,22 @@ all: $(all_targets) build-modules: $(PHP_MODULES) -libphp6.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 libphp6.la $(phptempdir)/libphp6.la >/dev/null 2>&1 + -@$(LIBTOOL) --silent --mode=install cp $@ $(phptempdir)/$@ >/dev/null 2>&1 -libs/libphp6.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/libphp6.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)/libphp6.$(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)/libphp6.$(SHLIB_DL_SUFFIX_NAME).$$i; then \ - $(LN_S) $(phptempdir)/libphp6.$(SHLIB_DL_SUFFIX_NAME).$$i $(phptempdir)/libphp6.$(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; \ @@ -134,10 +134,10 @@ clean: 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 libphp6.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/libphp6.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 diff --git a/acinclude.m4 b/acinclude.m4 index 439b3de980..52fd0363fd 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -773,7 +773,7 @@ dnl PHP_BUILD_SHARED dnl AC_DEFUN([PHP_BUILD_SHARED],[ PHP_BUILD_PROGRAM - OVERALL_TARGET=libphp6.la + OVERALL_TARGET=libphp[]$PHP_MAJOR_VERSION[.la] php_build_target=shared php_c_pre=$shared_c_pre @@ -790,7 +790,7 @@ dnl PHP_BUILD_STATIC dnl AC_DEFUN([PHP_BUILD_STATIC],[ PHP_BUILD_PROGRAM - OVERALL_TARGET=libphp6.la + OVERALL_TARGET=libphp[]$PHP_MAJOR_VERSION[.la] php_build_target=static ]) @@ -799,7 +799,7 @@ dnl PHP_BUILD_BUNDLE dnl AC_DEFUN([PHP_BUILD_BUNDLE],[ PHP_BUILD_PROGRAM - OVERALL_TARGET=libs/libphp6.bundle + OVERALL_TARGET=libs/libphp[]$PHP_MAJOR_VERSION[.bundle] php_build_target=static ]) @@ -2701,6 +2701,12 @@ AC_DEFUN([PHP_CHECK_CONFIGURE_OPTIONS],[ # 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 @@ -1,8 +1,8 @@ #!/bin/sh # $Id$ -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 ;; diff --git a/configure.in b/configure.in index c1a2b5f6b8..02c6f28c9c 100644 --- a/configure.in +++ b/configure.in @@ -39,12 +39,18 @@ PHP_CANONICAL_HOST_TARGET AC_CONFIG_HEADER(main/php_config.h) -MAJOR_VERSION=6 -MINOR_VERSION=0 -RELEASE_VERSION=0 -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=6 +PHP_MINOR_VERSION=0 +PHP_RELEASE_VERSION=0 +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 @@ dnl ------------------------------------------------------------------------- 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 @@ case $host_alias in 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 SAPI configuration. dnl ------------------------------------------------------------------------- dnl paths to the targets are relative to the build directory -SAPI_SHARED=libs/libphp6.$SHLIB_DL_SUFFIX_NAME -SAPI_STATIC=libs/libphp6.a -SAPI_LIBTOOL=libphp6.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) diff --git a/win32/build/confutils.js b/win32/build/confutils.js index f4ebc83380..1c6de194de 100644 --- a/win32/build/confutils.js +++ b/win32/build/confutils.js @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -// $Id: confutils.js,v 1.68 2007-07-21 11:24:36 derick Exp $ +// $Id: confutils.js,v 1.69 2007-07-26 22:45:22 jani Exp $ var STDOUT = WScript.StdOut; var STDERR = WScript.StdErr; @@ -53,18 +53,18 @@ function get_version_numbers() { 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; |