scottmac Mon Dec 29 15:27:11 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/pcre config0.m4
Log:
Fix bug #46959 - Can't disable PCRE in 5.2.x, too much was backported from
5.3.
http://cvs.php.net/viewvc.cgi/php-src/ext/pcre/config0.m4?r1=1.38.2.3.2.11&r2=1.38.2.3.2.12&diff_format=u
Index: php-src/ext/pcre/config0.m4
diff -u php-src/ext/pcre/config0.m4:1.38.2.3.2.11
php-src/ext/pcre/config0.m4:1.38.2.3.2.12
--- php-src/ext/pcre/config0.m4:1.38.2.3.2.11 Sun Nov 23 18:30:36 2008
+++ php-src/ext/pcre/config0.m4 Mon Dec 29 15:27:11 2008
@@ -1,16 +1,21 @@
dnl
-dnl $Id: config0.m4,v 1.38.2.3.2.11 2008/11/23 18:30:36 iliaa Exp $
+dnl $Id: config0.m4,v 1.38.2.3.2.12 2008/12/29 15:27:11 scottmac 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,,
-[ --with-pcre-regex=DIR Include Perl Compatible Regular Expressions support.
- DIR is the PCRE install prefix [BUNDLED]], yes, no)
-
- if test "$PHP_PCRE_REGEX" != "yes" && test "$PHP_PCRE_REGEX" != "no"; then
- AC_MSG_CHECKING([for PCRE headers location])
+PHP_ARG_WITH(pcre-regex,for PCRE support,
+[ --without-pcre-regex Do not include Perl Compatible Regular Expressions
support.
+ DIR is the PCRE install prefix [BUNDLED]], yes)
+
+if test "$PHP_PCRE_REGEX" != "no"; then
+ if test "$PHP_PCRE_REGEX" = "yes"; then
+ PHP_NEW_EXTENSION(pcre, pcrelib/pcre_chartables.c pcrelib/pcre_ucd.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,,-...@ext_srcdir@/pcrelib)
+ PHP_ADD_BUILD_DIR($ext_builddir/pcrelib)
+ PHP_INSTALL_HEADERS([ext/pcre], [php_pcre.h pcrelib/])
+ AC_DEFINE(HAVE_BUNDLED_PCRE, 1, [ ])
+ else
for i in $PHP_PCRE_REGEX $PHP_PCRE_REGEX/include
$PHP_PCRE_REGEX/include/pcre; do
test -f $i/pcre.h && PCRE_INCDIR=$i
done
@@ -18,9 +23,7 @@
if test -z "$PCRE_INCDIR"; then
AC_MSG_ERROR([Could not find pcre.h in $PHP_PCRE_REGEX])
fi
- AC_MSG_RESULT([$PCRE_INCDIR])
- AC_MSG_CHECKING([for PCRE library location])
for j in $PHP_PCRE_REGEX $PHP_PCRE_REGEX/$PHP_LIBDIR; do
test -f $j/libpcre.a || test -f $j/libpcre.$SHLIB_SUFFIX_NAME &&
PCRE_LIBDIR=$j
done
@@ -28,7 +31,6 @@
if test -z "$PCRE_LIBDIR" ; then
AC_MSG_ERROR([Could not find libpcre.(a|$SHLIB_SUFFIX_NAME) in
$PHP_PCRE_REGEX])
fi
- AC_MSG_RESULT([$PCRE_LIBDIR])
changequote({,})
pcre_major=`grep PCRE_MAJOR $PCRE_INCDIR/pcre.h | sed -e 's/[^0-9]//g'`
@@ -43,24 +45,14 @@
AC_MSG_ERROR([The PCRE extension requires PCRE library version >= 6.6])
fi
- PHP_ADD_LIBRARY_WITH_PATH(pcre, $PCRE_LIBDIR)
+ PHP_ADD_LIBRARY_WITH_PATH(pcre, $PCRE_LIBDIR, PCRE_SHARED_LIBADD)
AC_DEFINE(HAVE_PCRE, 1, [ ])
PHP_ADD_INCLUDE($PCRE_INCDIR)
- PHP_NEW_EXTENSION(pcre, php_pcre.c, no)
+ PHP_NEW_EXTENSION(pcre, php_pcre.c, $ext_shared)
PHP_INSTALL_HEADERS([ext/pcre], [php_pcre.h])
- else
- AC_MSG_CHECKING([for PCRE library to use])
- AC_MSG_RESULT([bundled])
- pcrelib_sources="pcrelib/pcre_chartables.c pcrelib/pcre_ucd.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_NEW_EXTENSION(pcre, $pcrelib_sources php_pcre.c,
no,,-...@ext_srcdir@/pcrelib)
- PHP_ADD_BUILD_DIR($ext_builddir/pcrelib)
- PHP_INSTALL_HEADERS([ext/pcre], [php_pcre.h pcrelib/])
- AC_DEFINE(HAVE_BUNDLED_PCRE, 1, [ ])
+ 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
