cvs: php4 /ext/pcre config.m4

edink Tue Jul 23 09:07:29 2002 EDT Modified files: /php4/ext/pcre config.m4 Log: 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. Index: php4/ext/pcre/config.m4 diff -u php4/ext/pcre/config.m4:1.27 php4/ext/pcre/config.m4:1.28 --- php4/ext/pcre/config.m4:1.27 Thu Mar 7 09:19:31 2002 +++ php4/ext/pcre/config.m4 Tue Jul 23 09:07:29 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.27 2002/03/07 14:19:31 sas Exp $ +dnl $Id: config.m4,v 1.28 2002/07/23 13:07:29 edink Exp $ dnl dnl By default we'll compile and link against the bundled PCRE library @@ -19,7 +19,8 @@ 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 @@ 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)