helly Sun Feb 17 20:49:46 2008 UTC
Modified files:
/php-src acinclude.m4 configure.in Makefile.global
Log:
- Allow zend_extensions to be build inside ext and tested with 'make test'
http://cvs.php.net/viewvc.cgi/php-src/acinclude.m4?r1=1.385&r2=1.386&diff_format=u
Index: php-src/acinclude.m4
diff -u php-src/acinclude.m4:1.385 php-src/acinclude.m4:1.386
--- php-src/acinclude.m4:1.385 Mon Dec 31 04:27:47 2007
+++ php-src/acinclude.m4 Sun Feb 17 20:49:45 2008
@@ -1,5 +1,5 @@
dnl
-dnl $Id: acinclude.m4,v 1.385 2007/12/31 04:27:47 jon Exp $
+dnl $Id: acinclude.m4,v 1.386 2008/02/17 20:49:45 helly Exp $
dnl
dnl This file contains local autoconf functions.
dnl
@@ -837,7 +837,7 @@
])
dnl
-dnl PHP_SHARED_MODULE(module-name, object-var, build-dir, cxx)
+dnl PHP_SHARED_MODULE(module-name, object-var, build-dir, cxx, zend_ext)
dnl
dnl Basically sets up the link-stage for building module-name
dnl from object_var in build-dir.
@@ -860,7 +860,11 @@
;;
esac
- PHP_MODULES="$PHP_MODULES \$(phplibdir)/$1.$suffix"
+ if test "x$5" = "xyes"; then
+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/$1.$suffix"
+ else
+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/$1.$suffix"
+ fi
PHP_SUBST($2)
cat >>Makefile.objects<<EOF
\$(phplibdir)/$1.$suffix: $3/$1.$suffix
@@ -916,7 +920,7 @@
])
dnl
-dnl PHP_NEW_EXTENSION(extname, sources [, shared [,sapi_class[, extra-cflags[,
cxx]]]])
+dnl PHP_NEW_EXTENSION(extname, sources [, shared [,sapi_class[, extra-cflags[,
cxx[, zend_ext]]]]])
dnl
dnl Includes an extension in the build.
dnl
@@ -950,10 +954,10 @@
PHP_ADD_SOURCES_X(PHP_EXT_DIR($1),$2,$ac_extra,shared_objects_$1,yes)
case $host_alias in
*netware*[)]
- PHP_SHARED_MODULE(php$1,shared_objects_$1, $ext_builddir, $6)
+ PHP_SHARED_MODULE(php$1,shared_objects_$1, $ext_builddir, $6, $7)
;;
*[)]
- PHP_SHARED_MODULE($1,shared_objects_$1, $ext_builddir, $6)
+ PHP_SHARED_MODULE($1,shared_objects_$1, $ext_builddir, $6, $7)
;;
esac
AC_DEFINE_UNQUOTED([COMPILE_DL_]translit($1,a-z_-,A-Z__), 1, Whether to
build $1 as dynamic module)
http://cvs.php.net/viewvc.cgi/php-src/configure.in?r1=1.646&r2=1.647&diff_format=u
Index: php-src/configure.in
diff -u php-src/configure.in:1.646 php-src/configure.in:1.647
--- php-src/configure.in:1.646 Thu Feb 14 10:25:10 2008
+++ php-src/configure.in Sun Feb 17 20:49:46 2008
@@ -1,4 +1,4 @@
-## $Id: configure.in,v 1.646 2008/02/14 10:25:10 dmitry Exp $ -*- autoconf -*-
+## $Id: configure.in,v 1.647 2008/02/17 20:49:46 helly Exp $ -*- autoconf -*-
dnl ## Process this file with autoconf to produce a configure script.
divert(1)
@@ -870,7 +870,7 @@
case $php_build_target in
program|static)
standard_libtool_flag='-prefer-non-pic -static'
- if test -z "$PHP_MODULES"; then
+ if test -z "$PHP_MODULES" && test -z "$PHP_ZEND_EX"; then
enable_shared=no
fi
;;
@@ -1076,6 +1076,7 @@
PHP_SUBST(PHP_GLOBAL_OBJS)
PHP_SUBST(PHP_MODULES)
+PHP_SUBST(PHP_ZEND_EX)
PHP_SUBST(EXT_LIBS)
@@ -1156,6 +1157,17 @@
CPPFLAGS="$CPPFLAGS -DTHREAD=1"
fi
+if test "$PHP_DEBUG" = "yes" && test "$PHP_THREAD_SAFETY" = "yes; then
+ZEND_EXT_TYPE="zend_extension_debug_ts"
+elif test "$PHP_DEBUG" = "yes"; then
+ZEND_EXT_TYPE="zend_extension_debug"
+elif test "$PHP_THREAD_SAFETY" = "yes; then
+ZEND_EXT_TYPE="zend_extension_ts"
+else
+ZEND_EXT_TYPE="zend_extension"
+fi
+PHP_SUBST(ZEND_EXT_TYPE)
+
dnl
dnl Libtool creation
dnl
@@ -1192,7 +1204,7 @@
INLINE_CFLAGS="$INLINE_CFLAGS $standard_libtool_flag"
CXXFLAGS="$CXXFLAGS $standard_libtool_flag"
-all_targets="$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES)
\$(PHP_CLI_TARGET)"
+all_targets="$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_ZEND_EX)
\$(PHP_CLI_TARGET)"
install_targets="$install_modules install-build install-headers
install-programs"
case $PHP_SAPI in
http://cvs.php.net/viewvc.cgi/php-src/Makefile.global?r1=1.85&r2=1.86&diff_format=u
Index: php-src/Makefile.global
diff -u php-src/Makefile.global:1.85 php-src/Makefile.global:1.86
--- php-src/Makefile.global:1.85 Fri Aug 3 14:01:40 2007
+++ php-src/Makefile.global Sun Feb 17 20:49:46 2008
@@ -11,7 +11,7 @@
@echo "Don't forget to run 'make test'."
@echo
-build-modules: $(PHP_MODULES)
+build-modules: $(PHP_MODULES) $(PHP_ZEND_EX)
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 $@
@@ -73,6 +73,11 @@
for i in $(PHP_MODULES)""; do \
. $$i; $(top_srcdir)/build/shtool echo -n -- " -d
extension=$$dlname"; \
done; \
+ fi; \
+ if test "x$(PHP_ZEND_EX)" != "x"; then \
+ for i in $(PHP_ZEND_EX)""; do \
+ . $$i; $(top_srcdir)/build/shtool echo -n -- " -d
$(ZEND_EXT_TYPE)=$(top_builddir)/modules/$$dlname"; \
+ done; \
fi`
test: all
@@ -84,7 +89,7 @@
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 \
- $(EGREP) -v '^extension[\t\ ]*=' "$$INI_FILE" >
$(top_builddir)/tmp-php.ini; \
+ $(EGREP) -v '^(zend_)?extension(_debug)?(_ts)?[\t\ ]*='
"$$INI_FILE" > $(top_builddir)/tmp-php.ini; \
else \
echo > $(top_builddir)/tmp-php.ini; \
fi; \
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
