From 3bfa3d163d80768b6026d376a64ac0ead4ceefef Mon Sep 17 00:00:00 2001 From: Marcus Boerger Date: Thu, 10 Apr 2008 19:41:24 +0000 Subject: [PATCH] - No longer allow to disable pcre --- ext/pcre/config0.m4 | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/ext/pcre/config0.m4 b/ext/pcre/config0.m4 index ebd7850d0ba..2f53619a9b2 100644 --- a/ext/pcre/config0.m4 +++ b/ext/pcre/config0.m4 @@ -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) @@ -54,6 +55,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