1 --- php-5.3.2/configure.in~ 2010-03-16 12:16:56.000000000 +0200
2 +++ php-5.3.2/configure.in 2010-03-16 16:13:24.926435546 +0200
4 PHP_SUBST(PHP_CLI_OBJS)
5 PHP_SUBST(PHP_GLOBAL_OBJS)
7 +# shift so that pcre, spl, ... are loaded first
8 +PHP_MODULES=$(echo "$PHP_MODULES" | sed -e 's,\(.*\)\(\$(phplibdir)/xml.la \),\2\1,')
9 +PHP_MODULES=$(echo "$PHP_MODULES" | sed -e 's,\(.*\)\(\$(phplibdir)/spl.la \),\2\1,')
10 +PHP_MODULES=$(echo "$PHP_MODULES" | sed -e 's,\(.*\)\(\$(phplibdir)/pcre.la \),\2\1,')
12 PHP_SUBST(PHP_MODULES)
13 PHP_SUBST(PHP_ZEND_EX)
15 --- php-5.3.2/Makefile.global 2010-03-16 16:14:24.340804566 +0200
16 +++ php-5.3.2/Makefile.global 2010-03-16 16:31:36.972576955 +0200
21 -PHP_TEST_SETTINGS = -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1'
22 +PHP_TEST_SETTINGS = -d 'open_basedir=' -d 'output_buffering=0' -d 'memory_limit=-1' -d 'safe_mode=0'
23 PHP_TEST_SHARED_EXTENSIONS = ` \
24 if test "x$(PHP_MODULES)" != "x"; then \
25 for i in $(PHP_MODULES)""; do \
27 TEST_PHP_EXECUTABLE=$(PHP_EXECUTABLE) \
28 TEST_PHP_SRCDIR=$(top_srcdir) \
30 - $(PHP_EXECUTABLE) -n -c $(top_builddir)/tmp-php.ini $(PHP_TEST_SETTINGS) $(top_srcdir)/run-tests.php -n -c $(top_builddir)/tmp-php.ini -d extension_dir=$(top_builddir)/modules/ $(PHP_TEST_SHARED_EXTENSIONS) $(TESTS); \
31 + $(PHP_EXECUTABLE) -n -c $(top_builddir)/tmp-php.ini \
32 + -d extension_dir=$(top_builddir)/modules/ -d 'extension=pcre.$(SHLIB_DL_SUFFIX_NAME)' \
33 + $(PHP_TEST_SETTINGS) $(top_srcdir)/run-tests.php -n -c $(top_builddir)/tmp-php.ini \
34 + -d extension_dir=$(top_builddir)/modules/ $(PHP_TEST_SHARED_EXTENSIONS) $(RUN_TESTS_ARGS) $(TESTS); \
36 echo "ERROR: Cannot run tests without CLI sapi."; \