diff options
| author | Sascha Schumann <sas@php.net> | 1999-09-17 01:47:15 +0000 |
|---|---|---|
| committer | Sascha Schumann <sas@php.net> | 1999-09-17 01:47:15 +0000 |
| commit | 09af5f967f3f6b6a9faa71cfb2b1af7c3ba21284 (patch) | |
| tree | e6f0d398ae7b32c6e73e3e81ca3cc5a2ae672dc4 /ext/xml/config.m4 | |
| parent | 5a468e740c0fdff3ae3c24ee0ee164753a86a51a (diff) | |
| download | php-git-09af5f967f3f6b6a9faa71cfb2b1af7c3ba21284.tar.gz | |
supply path to xml include dir for APXS and APACI
Diffstat (limited to 'ext/xml/config.m4')
| -rw-r--r-- | ext/xml/config.m4 | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/ext/xml/config.m4 b/ext/xml/config.m4 index 4d27918a68..61f70ff606 100644 --- a/ext/xml/config.m4 +++ b/ext/xml/config.m4 @@ -26,21 +26,18 @@ AC_ARG_WITH(xml, else AC_MSG_RESULT([yes (static)]) fi + + if test -z "$XML_INCLUDE" ; then if test "$withval" = "yes"; then test -d /usr/include/xml && XML_INCLUDE="/usr/include/xml" test -d /usr/local/include/xml && XML_INCLUDE="/usr/local/include/xml" test -d /usr/include/xmltok && XML_INCLUDE="/usr/include/xmltok" - if test -n "$APXS" ; then - dir=`$APXS -q INCLUDEDIR` - test -d $dir/xml && XML_INCLUDE="$dir/xml" - else AC_CHECK_LIB(expat, main, XML_LIBS="-lexpat", AC_CHECK_LIB(xmltok, main, AC_CHECK_LIB(xmlparse, main, XML_LIBS="-lxmlparse -lxmltok", AC_MSG_ERROR(No expat library found for the xml module),"-lxmltok"), AC_MSG_ERROR(No expart library found for the xml module)) ) - fi else XML_LIBS="-L$withval/lib -lexpat" if test -d $withval/include/xml; then @@ -49,6 +46,7 @@ AC_ARG_WITH(xml, XML_INCLUDE="$withval/include" fi fi + fi AC_DEFINE(HAVE_LIBEXPAT, 1) PHP_EXTENSION(xml, $shared) if test "$shared" != "yes"; then |