scottmac Tue, 11 Aug 2009 12:03:29 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=287081
Log:
Search /usr/include too for those wanting to use a system PCRE.
Changed paths:
U php/php-src/branches/PHP_5_2/ext/pcre/config0.m4
U php/php-src/branches/PHP_5_3/ext/pcre/config0.m4
U php/php-src/trunk/ext/pcre/config0.m4
Modified: php/php-src/branches/PHP_5_2/ext/pcre/config0.m4
===================================================================
--- php/php-src/branches/PHP_5_2/ext/pcre/config0.m4 2009-08-11 11:58:11 UTC
(rev 287080)
+++ php/php-src/branches/PHP_5_2/ext/pcre/config0.m4 2009-08-11 12:03:29 UTC
(rev 287081)
@@ -16,7 +16,7 @@
PHP_INSTALL_HEADERS([ext/pcre], [php_pcre.h pcrelib/])
AC_DEFINE(HAVE_BUNDLED_PCRE, 1, [ ])
else
- for i in $PHP_PCRE_REGEX $PHP_PCRE_REGEX/include
$PHP_PCRE_REGEX/include/pcre; do
+ for i in $PHP_PCRE_REGEX $PHP_PCRE_REGEX/include
$PHP_PCRE_REGEX/local/include $PHP_PCRE_REGEX/include/pcre; do
test -f $i/pcre.h && PCRE_INCDIR=$i
done
Modified: php/php-src/branches/PHP_5_3/ext/pcre/config0.m4
===================================================================
--- php/php-src/branches/PHP_5_3/ext/pcre/config0.m4 2009-08-11 11:58:11 UTC
(rev 287080)
+++ php/php-src/branches/PHP_5_3/ext/pcre/config0.m4 2009-08-11 12:03:29 UTC
(rev 287081)
@@ -11,7 +11,7 @@
if test "$PHP_PCRE_REGEX" != "yes" && test "$PHP_PCRE_REGEX" != "no"; then
AC_MSG_CHECKING([for PCRE headers location])
- for i in $PHP_PCRE_REGEX $PHP_PCRE_REGEX/include
$PHP_PCRE_REGEX/include/pcre; do
+ for i in $PHP_PCRE_REGEX $PHP_PCRE_REGEX/include
$PHP_PCRE_REGEX/local/include $PHP_PCRE_REGEX/include/pcre; do
test -f $i/pcre.h && PCRE_INCDIR=$i
done
Modified: php/php-src/trunk/ext/pcre/config0.m4
===================================================================
--- php/php-src/trunk/ext/pcre/config0.m4 2009-08-11 11:58:11 UTC (rev
287080)
+++ php/php-src/trunk/ext/pcre/config0.m4 2009-08-11 12:03:29 UTC (rev
287081)
@@ -11,7 +11,7 @@
if test "$PHP_PCRE_REGEX" != "yes" && test "$PHP_PCRE_REGEX" != "no"; then
AC_MSG_CHECKING([for PCRE headers location])
- for i in $PHP_PCRE_REGEX $PHP_PCRE_REGEX/include
$PHP_PCRE_REGEX/include/pcre; do
+ for i in $PHP_PCRE_REGEX $PHP_PCRE_REGEX/include
$PHP_PCRE_REGEX/local/include $PHP_PCRE_REGEX/include/pcre; do
test -f $i/pcre.h && PCRE_INCDIR=$i
done
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
