summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSascha Schumann <sas@php.net>1999-09-17 00:57:28 +0000
committerSascha Schumann <sas@php.net>1999-09-17 00:57:28 +0000
commit79fd46c3a18e27829c5efe0a0ff80316444963ba (patch)
tree1b73f62ad6464b745347dcc043e8b3f2a375ae97
parent51ad9501d117a593e2c7b40581985d01346c2de1 (diff)
downloadphp-git-79fd46c3a18e27829c5efe0a0ff80316444963ba.tar.gz
If available, use Apache's embedded expat
-rw-r--r--ext/xml/config.m45
1 files changed, 5 insertions, 0 deletions
diff --git a/ext/xml/config.m4 b/ext/xml/config.m4
index 93b6ed424d..4d27918a68 100644
--- a/ext/xml/config.m4
+++ b/ext/xml/config.m4
@@ -30,12 +30,17 @@ AC_ARG_WITH(xml,
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