diff options
| author | Elizabeth Marie Smith <auroraeosrose@php.net> | 2008-05-02 14:05:53 +0000 |
|---|---|---|
| committer | Elizabeth Marie Smith <auroraeosrose@php.net> | 2008-05-02 14:05:53 +0000 |
| commit | 3adf07b5c6c792fc6fe4557c12f5917517e40457 (patch) | |
| tree | c51fd071a0c59940a5e5b3ab91ddf1ed7c3f517e | |
| parent | 0bc6920f6647bee1813f5e8d422ed4bae2f32908 (diff) | |
| download | php-git-3adf07b5c6c792fc6fe4557c12f5917517e40457.tar.gz | |
Fix reflection (always static, never shared) and disable turning off pcre and spl (also always static, never shared)
| -rw-r--r-- | ext/pcre/config.w32 | 6 | ||||
| -rwxr-xr-x | ext/reflection/config.w32 | 2 | ||||
| -rw-r--r-- | ext/spl/config.w32 | 10 |
3 files changed, 4 insertions, 14 deletions
diff --git a/ext/pcre/config.w32 b/ext/pcre/config.w32 index b52aa71236..64425cc09e 100644 --- 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 343b77d37d..90b076acb1 100755 --- 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 ebed9c6bc5..33fe8767b8 100644 --- 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); -} + |