[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/ext/pcre/config0.m4 branches/PHP_5_3/ext/pcre/config0.m4 trunk/ext/pcre/config0.m4
scottmac Tue, 11 Aug 2009 12:03:29 + Revision: http://svn.php.net/viewvc?view=revisionrevision=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.m42009-08-11 11:58:11 UTC (rev 287080) +++ php/php-src/branches/PHP_5_2/ext/pcre/config0.m42009-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.m42009-08-11 11:58:11 UTC (rev 287080) +++ php/php-src/branches/PHP_5_3/ext/pcre/config0.m42009-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
Re: [PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/ext/pcre/config0.m4 branches/PHP_5_3/ext/pcre/config0.m4 trunk/ext/pcre/config0.m4
On Tue, 11 Aug 2009, Scott MacVicar wrote: scottmac Tue, 11 Aug 2009 12:03:29 + Revision: http://svn.php.net/viewvc?view=revisionrevision=287081 Log: Search /usr/include too for those wanting to use a system PCRE. This message says something else than you did: -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 regards, Derick -- http://derickrethans.nl | http://ezcomponents.org | http://xdebug.org twitter: @derickr -- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
[PHP-CVS] svn: /php/php-src/ branches/PHP_5_2/ext/pcre/config0.m4 branches/PHP_5_3/ext/pcre/config0.m4 trunk/ext/pcre/config0.m4
scottmac Tue, 11 Aug 2009 21:40:15 + Revision: http://svn.php.net/viewvc?view=revisionrevision=287118 Log: We should check /usr/local/include last 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.m42009-08-11 21:33:36 UTC (rev 287117) +++ php/php-src/branches/PHP_5_2/ext/pcre/config0.m42009-08-11 21:40:15 UTC (rev 287118) @@ -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/local/include $PHP_PCRE_REGEX/include/pcre; do +for i in $PHP_PCRE_REGEX $PHP_PCRE_REGEX/include $PHP_PCRE_REGEX/include/pcre $PHP_PCRE_REGEX/local/include; 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.m42009-08-11 21:33:36 UTC (rev 287117) +++ php/php-src/branches/PHP_5_3/ext/pcre/config0.m42009-08-11 21:40:15 UTC (rev 287118) @@ -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/local/include $PHP_PCRE_REGEX/include/pcre; do +for i in $PHP_PCRE_REGEX $PHP_PCRE_REGEX/include $PHP_PCRE_REGEX/include/pcre $PHP_PCRE_REGEX/local/include; 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 21:33:36 UTC (rev 287117) +++ php/php-src/trunk/ext/pcre/config0.m4 2009-08-11 21:40:15 UTC (rev 287118) @@ -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/local/include $PHP_PCRE_REGEX/include/pcre; do +for i in $PHP_PCRE_REGEX $PHP_PCRE_REGEX/include $PHP_PCRE_REGEX/include/pcre $PHP_PCRE_REGEX/local/include; 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
