summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSascha Schumann <sas@php.net>2001-06-01 21:09:52 +0000
committerSascha Schumann <sas@php.net>2001-06-01 21:09:52 +0000
commitc4627466b9ffff622d66fb0b58f9ec554e3e50ab (patch)
tree1c215419c63a79b83eee8ef45ae8de79b49e588c
parent63b8a2b797f7cc7e139bdbe9901198070063c79f (diff)
downloadphp-git-c4627466b9ffff622d66fb0b58f9ec554e3e50ab.tar.gz
Fix logic. If I disable WDDX, I don't want to use an external
expat library.
-rw-r--r--ext/xml/config.m44
1 files changed, 3 insertions, 1 deletions
diff --git a/ext/xml/config.m4 b/ext/xml/config.m4
index da71601fca..bbb07f2ea5 100644
--- a/ext/xml/config.m4
+++ b/ext/xml/config.m4
@@ -18,7 +18,8 @@ PHP_ARG_ENABLE(xml,for XML support,
PHP_ARG_WITH(expat-dir, external libexpat install dir,
[ --with-expat-dir=DIR XML: external libexpat install dir])
-if test "$PHP_XML" = "yes" -a "$PHP_EXPAT_DIR" = "no"; then
+if test "$PHP_XML" = "yes"; then
+if test "$PHP_EXPAT_DIR" = "no"; then
PHP_EXTENSION(xml, $ext_shared)
PHP_SUBST(EXPAT_SHARED_LIBADD)
@@ -56,3 +57,4 @@ else
PHP_ADD_INCLUDE($EXPAT_DIR/include)
PHP_ADD_LIBRARY_WITH_PATH(expat, $EXPAT_DIR/lib, EXPAT_SHARED_LIBADD)
fi
+fi