diff options
| author | Edin Kadribasic <edink@php.net> | 2002-07-23 13:07:29 +0000 |
|---|---|---|
| committer | Edin Kadribasic <edink@php.net> | 2002-07-23 13:07:29 +0000 |
| commit | 35cd16f6bfddafd7e7a9146d89f67eb972fa0aa3 (patch) | |
| tree | 3858b110f2932c9e05d6b0f945dce35fd7a77ea3 /ext/pcre | |
| parent | 6a088a2e3cf9dde62345ea49550bd67520f6db7f (diff) | |
| download | php-git-35cd16f6bfddafd7e7a9146d89f67eb972fa0aa3.tar.gz | |
MFB (patch by Troels Arvin <troels@arvin.dk>).
Added pcre include path to global list of includes in order to allow
use of external pcre libs.
Diffstat (limited to 'ext/pcre')
| -rw-r--r-- | ext/pcre/config.m4 | 6 | ||||
| -rw-r--r-- | ext/pcre/config0.m4 | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/ext/pcre/config.m4 b/ext/pcre/config.m4 index 7f03ddd3df..2563494468 100644 --- a/ext/pcre/config.m4 +++ b/ext/pcre/config.m4 @@ -19,7 +19,8 @@ if test "$PHP_PCRE_REGEX" != "no"; then else test -f $PHP_PCRE_REGEX/pcre.h && PCRE_INCDIR=$PHP_PCRE_REGEX test -f $PHP_PCRE_REGEX/include/pcre.h && PCRE_INCDIR=$PHP_PCRE_REGEX/include - + test -f $PHP_PCRE_REGEX/include/pcre/pcre.h && PCRE_INCDIR=$PHP_PCRE_REGEX/include/pcre + if test -z "$PCRE_INCDIR"; then AC_MSG_RESULT(Could not find pcre.h in $PHP_PCRE_REGEX) fi @@ -47,7 +48,8 @@ if test "$PHP_PCRE_REGEX" != "no"; then PHP_ADD_LIBRARY_WITH_PATH(pcre, $PCRE_LIBDIR, PCRE_SHARED_LIBADD) AC_DEFINE(HAVE_PCRE, 1, [ ]) - PHP_NEW_EXTENSION(pcre, php_pcre.c, $ext_shared,,-DSUPPORT_UTF8 -I$PCRE_INCDIR) + PHP_ADD_INCLUDE($PCRE_INCDIR) + PHP_NEW_EXTENSION(pcre, php_pcre.c, $ext_shared,,-DSUPPORT_UTF8) fi fi PHP_SUBST(PCRE_SHARED_LIBADD) diff --git a/ext/pcre/config0.m4 b/ext/pcre/config0.m4 index 7f03ddd3df..2563494468 100644 --- a/ext/pcre/config0.m4 +++ b/ext/pcre/config0.m4 @@ -19,7 +19,8 @@ if test "$PHP_PCRE_REGEX" != "no"; then else test -f $PHP_PCRE_REGEX/pcre.h && PCRE_INCDIR=$PHP_PCRE_REGEX test -f $PHP_PCRE_REGEX/include/pcre.h && PCRE_INCDIR=$PHP_PCRE_REGEX/include - + test -f $PHP_PCRE_REGEX/include/pcre/pcre.h && PCRE_INCDIR=$PHP_PCRE_REGEX/include/pcre + if test -z "$PCRE_INCDIR"; then AC_MSG_RESULT(Could not find pcre.h in $PHP_PCRE_REGEX) fi @@ -47,7 +48,8 @@ if test "$PHP_PCRE_REGEX" != "no"; then PHP_ADD_LIBRARY_WITH_PATH(pcre, $PCRE_LIBDIR, PCRE_SHARED_LIBADD) AC_DEFINE(HAVE_PCRE, 1, [ ]) - PHP_NEW_EXTENSION(pcre, php_pcre.c, $ext_shared,,-DSUPPORT_UTF8 -I$PCRE_INCDIR) + PHP_ADD_INCLUDE($PCRE_INCDIR) + PHP_NEW_EXTENSION(pcre, php_pcre.c, $ext_shared,,-DSUPPORT_UTF8) fi fi PHP_SUBST(PCRE_SHARED_LIBADD) |