Fix reflection (always static, never shared) and disable turning off pcre and spl...

diff --git a/ext/pcre/config.w32 b/ext/pcre/config.w32
index b52aa71236245a96db75ca24c4500cd97b625388..64425cc09e55171f741012ca95ca87e83ad71a4b 100644 (file)
--- a/ext/pcre/config.w32
+++ b/ext/pcre/config.w32
@@ -1,14 +1,10 @@
 // $Id$
 // vim:ft=javascript
 
-ARG_WITH("pcre-regex", "Perl Compatible Regular Expressions", "yes");
-
-if (PHP_PCRE_REGEX == "yes") {
-       EXTENSION("pcre", "php_pcre.c", PHP_PCRE_REGEX_SHARED,
+EXTENSION("pcre", "php_pcre.c", false /* never shared */,
                "-DNO_RECURSE -Iext/pcre/pcrelib");
        ADD_SOURCES("ext/pcre/pcrelib", "pcre_chartables.c pcre_ucp_searchfuncs.c pcre_compile.c pcre_config.c pcre_exec.c pcre_fullinfo.c pcre_get.c pcre_globals.c pcre_info.c pcre_maketables.c pcre_newline.c pcre_ord2utf8.c pcre_refcount.c pcre_study.c pcre_tables.c pcre_try_flipped.c pcre_valid_utf8.c pcre_version.c pcre_xclass.c", "pcre");
        ADD_DEF_FILE("ext\\pcre\\php_pcre.def");
 
        AC_DEFINE('HAVE_BUNDLED_PCRE', 1, 'Using bundled PCRE library');
        AC_DEFINE('HAVE_PCRE', 1, 'Have PCRE library');
-}

diff --git a/ext/reflection/config.w32 b/ext/reflection/config.w32
index 343b77d37d5eafa8b9b87058bae097ef8e9c49e4..90b076acb13a9eec0ed66f0f2258775160a9f211 100755 (executable)
--- a/ext/reflection/config.w32
+++ b/ext/reflection/config.w32
@@ -1,5 +1,5 @@
 // $Id$
 // vim:ft=javascript
 
-EXTENSION("reflection", "php_reflection.c");
+EXTENSION("reflection", "php_reflection.c", false /* never shared */);
 AC_DEFINE('HAVE_REFLECTION', 1, 'Reflection support enabled');

diff --git a/ext/spl/config.w32 b/ext/spl/config.w32
index ebed9c6bc556ee2805fab16ddf09b532922fba4e..33fe8767b8a39c9cd4b6c09f8b5f9ef26b5d5841 100644 (file)
--- a/ext/spl/config.w32
+++ b/ext/spl/config.w32
@@ -1,12 +1,6 @@
 // $Id$
 // vim:ft=javascript
 
-ARG_ENABLE("spl", "SPL (Standard PHP Library) support", "yes");
-
-if (PHP_SPL != "no") {
-       if (PHP_SPL_SHARED) {
-               ERROR("SPL cannot be compiled as a shared ext");
-       }
-       EXTENSION("spl", "php_spl.c spl_functions.c spl_engine.c spl_iterators.c spl_array.c spl_directory.c spl_sxe.c spl_exceptions.c spl_observer.c spl_dllist.c spl_heap.c");
+       EXTENSION("spl", "php_spl.c spl_functions.c spl_engine.c spl_iterators.c spl_array.c spl_directory.c spl_sxe.c spl_exceptions.c spl_observer.c spl_dllist.c spl_heap.c", false /*never shared */);
        AC_DEFINE('HAVE_SPL', 1);
-}
+