helly Thu Apr 10 19:42:32 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/pcre config0.m4
Log:
- MFH No longer allow to disable pcre
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/config0.m4?r1=1.38.2.3.2.10&r2=1.38.2.3.2.10.2.1&diff_format=u
Index: php-src/ext/pcre/config0.m4
diff -u php-src/ext/pcre/config0.m4:1.38.2.3.2.10
php-src/ext/pcre/config0.m4:1.38.2.3.2.10.2.1
--- php-src/ext/pcre/config0.m4:1.38.2.3.2.10 Tue Sep 11 16:17:33 2007
+++ php-src/ext/pcre/config0.m4 Thu Apr 10 19:42:32 2008
@@ -1,15 +1,16 @@
dnl
-dnl $Id: config0.m4,v 1.38.2.3.2.10 2007/09/11 16:17:33 nlopess Exp $
+dnl $Id: config0.m4,v 1.38.2.3.2.10.2.1 2008/04/10 19:42:32 helly Exp $
dnl
dnl By default we'll compile and link against the bundled PCRE library
dnl if DIR is supplied, we'll use that for linking
PHP_ARG_WITH(pcre-regex,for PCRE support,
-[ --without-pcre-regex Do not include Perl Compatible Regular Expressions
support.
+[ --with-pcre-regex=DIR Include Perl Compatible Regular Expressions support.
DIR is the PCRE install prefix [BUNDLED]], yes)
-if test "$PHP_PCRE_REGEX" != "no"; then
+ext_shared=no
+
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_ADD_BUILD_DIR($ext_builddir/pcrelib)
@@ -53,6 +54,3 @@
PHP_INSTALL_HEADERS([ext/pcre], [php_pcre.h])
PHP_SUBST(PCRE_SHARED_LIBADD)
fi
-else
- PHP_PCRE=no
-fi
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
