cvs: /php4/ext/xml config.m4
| From: | Sascha Schumann | Date: | Fri, 17 Sep 1999 00:57:29 +0000 |
| Subject: | cvs: /php4/ext/xml config.m4 | ||
| Groups: | php.version4 | ||
| Request: | Send a blank email to php-version4+get-4547@lists.php.net to get a copy of this message | ||
sas Thu Sep 16 20:57:29 1999 EDT
Modified files:
/php4/ext/xml config.m4
Log:
If available, use Apache's embedded expat
Index: php4/ext/xml/config.m4
diff -u php4/ext/xml/config.m4:1.9 php4/ext/xml/config.m4:1.10
--- php4/ext/xml/config.m4:1.9 Fri Sep 3 12:37:00 1999
+++ php4/ext/xml/config.m4 Thu Sep 16 20:57:28 1999
@@ -1,5 +1,5 @@
# $Source: /local/repository/php4/ext/xml/config.m4,v $
-# $Id: config.m4,v 1.9 1999/09/03 16:37:00 gorgo Exp $
+# $Id: config.m4,v 1.10 1999/09/17 00:57:28 sas Exp $
AC_MSG_CHECKING(for XML support)
AC_ARG_WITH(xml,
@@ -30,12 +30,17 @@
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