nlopess Sat Sep 1 17:51:35 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/pcre config.w32 config0.m4 php_pcre.c
Log:
adapt for PCRE 7.3
remove ability to include config.h from php_pcre.c, as it seems pretty
useless and produces a few warnings
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/config.w32?r1=1.4.2.5.2.5&r2=1.4.2.5.2.6&diff_format=u
Index: php-src/ext/pcre/config.w32
diff -u php-src/ext/pcre/config.w32:1.4.2.5.2.5
php-src/ext/pcre/config.w32:1.4.2.5.2.6
--- php-src/ext/pcre/config.w32:1.4.2.5.2.5 Fri Jun 15 19:09:24 2007
+++ php-src/ext/pcre/config.w32 Sat Sep 1 17:51:35 2007
@@ -1,11 +1,11 @@
-// $Id: config.w32,v 1.4.2.5.2.5 2007/06/15 19:09:24 nlopess Exp $
+// $Id: config.w32,v 1.4.2.5.2.6 2007/09/01 17:51:35 nlopess 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,
- "-DNO_RECURSE -Iext/pcre/pcrelib");
+ "-DNO_RECURSE -DHAVE_CONFIG_H -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");
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/config0.m4?r1=1.38.2.3.2.8&r2=1.38.2.3.2.9&diff_format=u
Index: php-src/ext/pcre/config0.m4
diff -u php-src/ext/pcre/config0.m4:1.38.2.3.2.8
php-src/ext/pcre/config0.m4:1.38.2.3.2.9
--- php-src/ext/pcre/config0.m4:1.38.2.3.2.8 Tue Jul 3 17:25:34 2007
+++ php-src/ext/pcre/config0.m4 Sat Sep 1 17:51:35 2007
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config0.m4,v 1.38.2.3.2.8 2007/07/03 17:25:34 sniper Exp $
+dnl $Id: config0.m4,v 1.38.2.3.2.9 2007/09/01 17:51:35 nlopess Exp $
dnl
dnl By default we'll compile and link against the bundled PCRE library
@@ -11,7 +11,7 @@
if test "$PHP_PCRE_REGEX" != "no"; then
if test "$PHP_PCRE_REGEX" = "yes"; then
- PHP_NEW_EXTENSION(pcre, pcrelib/pcre_chartables.c
pcrelib/pcre_ucp_searchfuncs.c pcrelib/pcre_compile.c pcrelib/pcre_config.c
pcrelib/pcre_exec.c pcrelib/pcre_fullinfo.c pcrelib/pcre_get.c
pcrelib/pcre_globals.c pcrelib/pcre_info.c pcrelib/pcre_maketables.c
pcrelib/pcre_newline.c pcrelib/pcre_ord2utf8.c pcrelib/pcre_refcount.c
pcrelib/pcre_study.c pcrelib/pcre_tables.c pcrelib/pcre_try_flipped.c
pcrelib/pcre_valid_utf8.c pcrelib/pcre_version.c pcrelib/pcre_xclass.c
php_pcre.c, $ext_shared,,[EMAIL PROTECTED]@/pcrelib)
+ PHP_NEW_EXTENSION(pcre, pcrelib/pcre_chartables.c
pcrelib/pcre_ucp_searchfuncs.c pcrelib/pcre_compile.c pcrelib/pcre_config.c
pcrelib/pcre_exec.c pcrelib/pcre_fullinfo.c pcrelib/pcre_get.c
pcrelib/pcre_globals.c pcrelib/pcre_info.c pcrelib/pcre_maketables.c
pcrelib/pcre_newline.c pcrelib/pcre_ord2utf8.c pcrelib/pcre_refcount.c
pcrelib/pcre_study.c pcrelib/pcre_tables.c pcrelib/pcre_try_flipped.c
pcrelib/pcre_valid_utf8.c pcrelib/pcre_version.c pcrelib/pcre_xclass.c
php_pcre.c, $ext_shared,,-DHAVE_CONFIG_H [EMAIL PROTECTED]@/pcrelib)
PHP_ADD_BUILD_DIR($ext_builddir/pcrelib)
PHP_INSTALL_HEADERS([ext/pcre], [php_pcre.h pcrelib/])
AC_DEFINE(HAVE_BUNDLED_PCRE, 1, [ ])
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/php_pcre.c?r1=1.168.2.9.2.19&r2=1.168.2.9.2.20&diff_format=u
Index: php-src/ext/pcre/php_pcre.c
diff -u php-src/ext/pcre/php_pcre.c:1.168.2.9.2.19
php-src/ext/pcre/php_pcre.c:1.168.2.9.2.20
--- php-src/ext/pcre/php_pcre.c:1.168.2.9.2.19 Tue Jul 24 22:35:18 2007
+++ php-src/ext/pcre/php_pcre.c Sat Sep 1 17:51:35 2007
@@ -16,11 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_pcre.c,v 1.168.2.9.2.19 2007/07/24 22:35:18 tony2001 Exp $ */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
+/* $Id: php_pcre.c,v 1.168.2.9.2.20 2007/09/01 17:51:35 nlopess Exp $ */
#include "php.h"
#include "php_ini.h"
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
