diff options
| author | Elizabeth Marie Smith <auroraeosrose@php.net> | 2008-05-02 14:10:05 +0000 |
|---|---|---|
| committer | Elizabeth Marie Smith <auroraeosrose@php.net> | 2008-05-02 14:10:05 +0000 |
| commit | 7a01c2c7387a0da49d889d1378f53ba2b1c64048 (patch) | |
| tree | 5d62bcc5e075c8eeb0d6025941a5067ed0e9b4df | |
| parent | d5a323788aee0e9513184fe68e50d277055e28c8 (diff) | |
| download | php-git-7a01c2c7387a0da49d889d1378f53ba2b1c64048.tar.gz | |
MFB
| -rw-r--r-- | ext/pcre/config.w32 | 15 | ||||
| -rwxr-xr-x | ext/reflection/config.w32 | 2 | ||||
| -rw-r--r-- | ext/spl/config.w32 | 11 |
3 files changed, 9 insertions, 19 deletions
diff --git a/ext/pcre/config.w32 b/ext/pcre/config.w32 index b52aa71236..e6f9425b75 100644 --- a/ext/pcre/config.w32 +++ b/ext/pcre/config.w32 @@ -1,14 +1,11 @@ // $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, - "-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"); +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'); -} +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..a0df01f91f 100644 --- a/ext/spl/config.w32 +++ b/ext/spl/config.w32 @@ -1,12 +1,5 @@ // $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"); - AC_DEFINE('HAVE_SPL', 1); -} +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); |