diff options
| author | Alex Dupre <ale@FreeBSD.org> | 2014-09-04 14:24:25 +0000 |
|---|---|---|
| committer | Alex Dupre <ale@FreeBSD.org> | 2014-09-04 14:24:25 +0000 |
| commit | f23aed7bde4b7e82cbb2943a38f6f60f51038567 (patch) | |
| tree | 65444edf752ebaf49e944ea49c7e7dad35e1de9a /textproc/php56-simplexml/files/patch-config.m4 | |
| parent | - Update to 1.20140824 (diff) | |
Import PHP 5.6 branch!
Notes
Notes:
svn path=/head/; revision=367268
Diffstat (limited to 'textproc/php56-simplexml/files/patch-config.m4')
| -rw-r--r-- | textproc/php56-simplexml/files/patch-config.m4 | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/textproc/php56-simplexml/files/patch-config.m4 b/textproc/php56-simplexml/files/patch-config.m4 new file mode 100644 index 000000000000..4eeef697dc87 --- /dev/null +++ b/textproc/php56-simplexml/files/patch-config.m4 @@ -0,0 +1,43 @@ +--- config.m4.orig 2014-05-14 10:14:22.929420181 +0000 ++++ config.m4 2014-05-14 10:15:36.967414693 +0000 +@@ -4,6 +4,9 @@ + PHP_ARG_ENABLE(simplexml, whether to enable SimpleXML support, + [ --disable-simplexml Disable SimpleXML support], yes) + ++PHP_ARG_WITH(pcre-dir, pcre install prefix, ++[ --with-pcre-dir SimpleXML: pcre install prefix], no, no) ++ + if test -z "$PHP_LIBXML_DIR"; then + PHP_ARG_WITH(libxml-dir, libxml2 install dir, + [ --with-libxml-dir=DIR SimpleXML: libxml2 install prefix], no, no) +@@ -11,6 +14,30 @@ + + if test "$PHP_SIMPLEXML" != "no"; then + ++ dnl This is PECL build, check if bundled PCRE library is used ++ old_CPPFLAGS=$CPPFLAGS ++ CPPFLAGS=$INCLUDES ++ AC_EGREP_CPP(yes,[ ++#include <main/php_config.h> ++#if defined(HAVE_BUNDLED_PCRE) && !defined(COMPILE_DL_PCRE) ++yes ++#endif ++ ],[ ++ PHP_PCRE_REGEX=yes ++ ],[ ++ AC_EGREP_CPP(yes,[ ++#include <main/php_config.h> ++#if defined(HAVE_PCRE) && !defined(COMPILE_DL_PCRE) ++yes ++#endif ++ ],[ ++ PHP_PCRE_REGEX=pecl ++ PHP_ADD_INCLUDE($PHP_PCRE_DIR/include) ++ ],[ ++ PHP_PCRE_REGEX=no ++ ]) ++ ]) ++ + if test "$PHP_LIBXML" = "no"; then + AC_MSG_ERROR([SimpleXML extension requires LIBXML extension, add --enable-libxml]) + fi |