diff options
Diffstat (limited to 'ext/pcre/config0.m4')
| -rw-r--r-- | ext/pcre/config0.m4 | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/ext/pcre/config0.m4 b/ext/pcre/config0.m4 index ebeb82e2b0..ab1d7dc309 100644 --- a/ext/pcre/config0.m4 +++ b/ext/pcre/config0.m4 @@ -12,17 +12,21 @@ AC_ARG_WITH(pcre-regex, AC_MSG_RESULT(no) ;; yes) EXTRA_LIBS="-Lext/pcre/pcrelib -lpcre $EXTRA_LIBS" - INCLUDES="-Ipcrelib $INCLUDES" + dnl INCLUDES="-Iext/pcre/pcrelib $INCLUDES" PCRE_SUBDIR="pcrelib" - AC_DEFINE(HAVE_LIBPCRE, 1) + AC_DEFINE(HAVE_PCRE, 1) + AC_DEFINE(HAVE_BUNDLED_PCRE, 1) AC_MSG_RESULT(yes) - PHP_EXTENSION(pcre) ;; + PHP_EXTENSION(pcre) ;; *) - test -f $withval/pcre.h && INCLUDES="-I$withval $INCLUDES" - test -f $withval/libpcre.a && EXTRA_LIBS="-L$withval -lpcre $EXTRA_LIBS" + test -f $withval/pcre.h && PCRE_INCLUDE="-I$withval" + test -f $withval/libpcre.a && PCRE_LIB="-L$withval -lpcre" if test -n "$PCRE_INCLUDE" && test -n "$PCRE_LIB" ; then - AC_DEFINE(HAVE_LIBPCRE, 1) + INCLUDES="$PCRE_INCLUDE $INCLUDES" + EXTRA_LIBS="$PCRE_LIB $EXTRA_LIBS" + AC_DEFINE(HAVE_PCRE, 1) + AC_DEFINE(HAVE_BUNDLED_PCRE, 0) PCRE_SUBDIR= AC_MSG_RESULT(yes) PHP_EXTENSION(pcre) @@ -32,9 +36,10 @@ AC_ARG_WITH(pcre-regex, esac ],[ EXTRA_LIBS="-Lext/pcre/pcrelib -lpcre $EXTRA_LIBS" - INCLUDES="-Ipcrelib $INCLUDES" +dnl INCLUDES="-Iext/pcre/pcrelib $INCLUDES" PCRE_SUBDIR="pcrelib" - AC_DEFINE(HAVE_LIBPCRE, 1) + AC_DEFINE(HAVE_PCRE, 1) + AC_DEFINE(HAVE_BUNDLED_PCRE, 1) AC_MSG_RESULT(yes) PHP_EXTENSION(pcre) ]) |