jani Thu Jul 26 22:45:22 2007 UTC
Modified files:
/php-src Makefile.global acinclude.m4 buildconf configure.in
/php-src/win32/build confutils.js
Log:
- Made build system less dependant for the PHP major version to also
ease MFB/MFH as acinclude.m4 and Makefile.global are identical in both
branches.
http://cvs.php.net/viewvc.cgi/php-src/Makefile.global?r1=1.83&r2=1.84&diff_format=u
Index: php-src/Makefile.global
diff -u php-src/Makefile.global:1.83 php-src/Makefile.global:1.84
--- php-src/Makefile.global:1.83 Wed Jul 4 10:15:47 2007
+++ php-src/Makefile.global Thu Jul 26 22:45:22 2007
@@ -13,22 +13,22 @@
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 $@
- [EMAIL PROTECTED](LIBTOOL) --silent --mode=install cp libphp6.la
$(phptempdir)/libphp6.la >/dev/null 2>&1
+ [EMAIL PROTECTED](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)"
[EMAIL PROTECTED](mkinstalldirs) $(INSTALL_ROOT)$(bindir)
- [EMAIL PROTECTED] test ! -r
$(phptempdir)/libphp6.$(SHLIB_DL_SUFFIX_NAME); then \
+ [EMAIL PROTECTED] 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 @@
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
http://cvs.php.net/viewvc.cgi/php-src/acinclude.m4?r1=1.381&r2=1.382&diff_format=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.381 php-src/acinclude.m4:1.382
--- php-src/acinclude.m4:1.381 Wed Jul 25 23:47:32 2007
+++ php-src/acinclude.m4 Thu Jul 26 22:45:22 2007
@@ -1,5 +1,5 @@
dnl
-dnl $Id: acinclude.m4,v 1.381 2007/07/25 23:47:32 jani Exp $
+dnl $Id: acinclude.m4,v 1.382 2007/07/26 22:45:22 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=libphp6.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=libphp6.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/libphp6.bundle
+ OVERALL_TARGET=libs/libphp[]$PHP_MAJOR_VERSION[.bundle]
php_build_target=static
])
@@ -2701,6 +2701,12 @@
# 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.66&r2=1.67&diff_format=u
Index: php-src/buildconf
diff -u php-src/buildconf:1.66 php-src/buildconf:1.67
--- php-src/buildconf:1.66 Tue Nov 29 22:26:04 2005
+++ php-src/buildconf Thu Jul 26 22:45:22 2007
@@ -1,8 +1,8 @@
#!/bin/sh
-# $Id: buildconf,v 1.66 2005/11/29 22:26:04 sniper Exp $
+# $Id: buildconf,v 1.67 2007/07/26 22:45:22 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.637&r2=1.638&diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.637 php-src/configure.in:1.638
--- php-src/configure.in:1.637 Sun Jul 15 19:50:06 2007
+++ php-src/configure.in Thu Jul 26 22:45:22 2007
@@ -1,4 +1,4 @@
-## $Id: configure.in,v 1.637 2007/07/15 19:50:06 jani Exp $ -*- autoconf -*-
+## $Id: configure.in,v 1.638 2007/07/26 22:45:22 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=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 @@
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/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)
http://cvs.php.net/viewvc.cgi/php-src/win32/build/confutils.js?r1=1.68&r2=1.69&diff_format=u
Index: php-src/win32/build/confutils.js
diff -u php-src/win32/build/confutils.js:1.68
php-src/win32/build/confutils.js:1.69
--- php-src/win32/build/confutils.js:1.68 Sat Jul 21 11:24:36 2007
+++ php-src/win32/build/confutils.js Thu Jul 26 22:45:22 2007
@@ -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 @@
{
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;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
