- load pcre from system extension dir

Changed files:
    fix-test-run.patch -> 1.6

diff --git a/fix-test-run.patch b/fix-test-run.patch
index 0dced2a486c9e76a5fc9b875b4d5fb66f14843ea..2231d77977dc3288c23d9f95a8fa3a1b68e181b8 100644 (file)
--- a/fix-test-run.patch
+++ b/fix-test-run.patch
@@ -43,7 +43,7 @@
                CC="$(CC)" \
 -                      $(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); \
 +                      $(PHP_EXECUTABLE) -n -c $(top_builddir)/tmp-php.ini \
-+                      -d extension_dir=$(top_builddir)/modules/ -d 'extension=pcre.$(SHLIB_DL_SUFFIX_NAME)' \
++                      -d extension_dir=$(top_builddir)/modules/ -d 'extension=$(EXTENSION_DIR)/pcre.$(SHLIB_DL_SUFFIX_NAME)' \
 +                      $(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) $(RUN_TESTS_SETTINGS) $(TESTS); \
        else \