]> granicus.if.org Git - php/commitdiff
- MFH No longer allow to disable pcre
authorMarcus Boerger <helly@php.net>
Thu, 10 Apr 2008 19:42:32 +0000 (19:42 +0000)
committerMarcus Boerger <helly@php.net>
Thu, 10 Apr 2008 19:42:32 +0000 (19:42 +0000)
ext/pcre/config0.m4

index 373af4e9bd015e50decef58e65785f00a631dcb3..a3e2e21902b5c0bb7fbbdfdd9f63d80db5fd3335 100644 (file)
@@ -6,10 +6,11 @@ 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,,-I@ext_srcdir@/pcrelib)
     PHP_ADD_BUILD_DIR($ext_builddir/pcrelib)
@@ -53,6 +54,3 @@ if test "$PHP_PCRE_REGEX" != "no"; then
     PHP_INSTALL_HEADERS([ext/pcre], [php_pcre.h])
     PHP_SUBST(PCRE_SHARED_LIBADD)
   fi
-else 
-  PHP_PCRE=no
-fi