From 86ee04e48dbc6d0fa7b170a2b1971089b25652df Mon Sep 17 00:00:00 2001 From: Sam Liddicott Date: Tue, 9 Dec 2003 13:13:42 +0000 Subject: [PATCH] Add patch from Blair Zajac to use php-config where available to find php include directories. git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@5514 626c5289-ae23-0410-ae9c-e8d60b6d4f22 --- SWIG/configure.in | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/SWIG/configure.in b/SWIG/configure.in index 3ab5cb4ef..7e030fc70 100644 --- a/SWIG/configure.in +++ b/SWIG/configure.in @@ -1039,15 +1039,22 @@ fi AC_SUBST(PHP4) AC_MSG_CHECKING(for PHP4 header files) -dirs="/usr/include/php /usr/local/include/php /usr/include/php4 /usr/local/include/php4 /usr/local/apache/php" -for i in $dirs; do - if test -r $i/php_config.h -o -r $i/php_version.h; then - AC_MSG_RESULT($i) - PHP4EXT="$i" - PHP4INC="-I$PHP4EXT -I$PHP4EXT/Zend -I$PHP4EXT/main -I$PHP4EXT/TSRM" - break; - fi -done +PHP4CONFIG="${PHP4}-config" +PHP4INC="`$PHP4CONFIG --includes 2>/dev/null`" +if test "$PHP4INC"; then + AC_MSG_RESULT($PHP4INC) +else + dirs="/usr/include/php /usr/local/include/php /usr/include/php4 /usr/local/include/php4 /usr/local/apache/php" + for i in $dirs; do + echo $i + if test -r $i/php_config.h -o -r $i/php_version.h; then + AC_MSG_RESULT($i) + PHP4EXT="$i" + PHP4INC="-I$PHP4EXT -I$PHP4EXT/Zend -I$PHP4EXT/main -I$PHP4EXT/TSRM" + break; + fi + done +fi if test -z "$PHP4INC"; then AC_MSG_RESULT(not found) fi