From: Edin Kadribasic <edink@php.net>
Date: Tue, 23 Jul 2002 13:07:29 +0000 (+0000)
Subject: MFB (patch by Troels Arvin <troels@arvin.dk>).
X-Git-Tag: dev~191
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=35cd16f6bfddafd7e7a9146d89f67eb972fa0aa3;p=php

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.
---

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)