auroraeosrose Fri May 2 14:05:53 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/pcre config.w32
/php-src/ext/reflection config.w32
/php-src/ext/spl config.w32
Log:
Fix reflection (always static, never shared) and disable turning off pcre and
spl (also always static, never shared)
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/config.w32?r1=1.4.2.5.2.7&r2=1.4.2.5.2.7.2.1&diff_format=u
Index: php-src/ext/pcre/config.w32
diff -u php-src/ext/pcre/config.w32:1.4.2.5.2.7
php-src/ext/pcre/config.w32:1.4.2.5.2.7.2.1
--- php-src/ext/pcre/config.w32:1.4.2.5.2.7 Tue Sep 11 16:17:33 2007
+++ php-src/ext/pcre/config.w32 Fri May 2 14:05:52 2008
@@ -1,14 +1,10 @@
-// $Id: config.w32,v 1.4.2.5.2.7 2007/09/11 16:17:33 nlopess Exp $
+// $Id: config.w32,v 1.4.2.5.2.7.2.1 2008/05/02 14:05:52 auroraeosrose Exp $
// 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');
-}
http://cvs.php.net/viewvc.cgi/php-src/ext/reflection/config.w32?r1=1.2.2.2.2.1.2.1&r2=1.2.2.2.2.1.2.2&diff_format=u
Index: php-src/ext/reflection/config.w32
diff -u php-src/ext/reflection/config.w32:1.2.2.2.2.1.2.1
php-src/ext/reflection/config.w32:1.2.2.2.2.1.2.2
--- php-src/ext/reflection/config.w32:1.2.2.2.2.1.2.1 Fri May 2 13:11:45 2008
+++ php-src/ext/reflection/config.w32 Fri May 2 14:05:53 2008
@@ -1,5 +1,5 @@
-// $Id: config.w32,v 1.2.2.2.2.1.2.1 2008/05/02 13:11:45 lstrojny Exp $
+// $Id: config.w32,v 1.2.2.2.2.1.2.2 2008/05/02 14:05:53 auroraeosrose Exp $
// vim:ft=javascript
-EXTENSION("reflection", "php_reflection.c");
+EXTENSION("reflection", "php_reflection.c", false /* never shared */);
AC_DEFINE('HAVE_REFLECTION', 1, 'Reflection support enabled');
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/config.w32?r1=1.7.6.2&r2=1.7.6.3&diff_format=u
Index: php-src/ext/spl/config.w32
diff -u php-src/ext/spl/config.w32:1.7.6.2 php-src/ext/spl/config.w32:1.7.6.3
--- php-src/ext/spl/config.w32:1.7.6.2 Mon Feb 25 23:39:08 2008
+++ php-src/ext/spl/config.w32 Fri May 2 14:05:53 2008
@@ -1,12 +1,6 @@
-// $Id: config.w32,v 1.7.6.2 2008/02/25 23:39:08 colder Exp $
+// $Id: config.w32,v 1.7.6.3 2008/05/02 14:05:53 auroraeosrose Exp $
// 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);
-}
+
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
