- Made the libxml related stuff to error out if someone does --disable-all

  or --disable-libxml. Better than silently just leave the ext out..

7 files changed, 64 insertions, 34 deletions

diff --git a/ext/dom/config.m4 b/ext/dom/config.m4
index b791b4db5c..e6a2cc6bed 100644
--- a/ext/dom/config.m4
+++ b/ext/dom/config.m4
@@ -10,7 +10,11 @@ if test -z "$PHP_LIBXML_DIR"; then
   [  --with-libxml-dir[=DIR]   DOM: libxml2 install prefix.], no, no)
 fi
 
-if test "$PHP_DOM" != "no" && test "$PHP_LIBXML" != "no"; then
+if test "$PHP_DOM" != "no"; then
+
+  if test "$PHP_LIBXML" = "no"; then   
+    AC_MSG_ERROR([DOM extension requires LIBXML extension, add --enable-libxml])
+  fi
 
   PHP_SETUP_LIBXML(DOM_SHARED_LIBADD, [
     AC_DEFINE(HAVE_DOM,1,[ ])
diff --git a/ext/simplexml/config.m4 b/ext/simplexml/config.m4
index 1869c20561..e498350466 100644
--- a/ext/simplexml/config.m4
+++ b/ext/simplexml/config.m4
@@ -1,15 +1,19 @@
 dnl $Id$
 dnl config.m4 for extension simplexml
 
-PHP_ARG_ENABLE(simplexml, whether to enable simplexml support,
-[  --disable-simplexml     Disable simplexml support], yes)
+PHP_ARG_ENABLE(simplexml, whether to enable SimpleXML support,
+[  --disable-simplexml     Disable SimpleXML support], yes)
 
 if test -z "$PHP_LIBXML_DIR"; then
   PHP_ARG_WITH(libxml-dir, libxml2 install dir,
   [  --with-libxml-dir=DIR     SimpleXML: libxml2 install prefix], no, no)
 fi
 
-if test "$PHP_SIMPLEXML" != "no" && test "$PHP_LIBXML" != "no"; then
+if test "$PHP_SIMPLEXML" != "no"; then
+
+  if test "$PHP_LIBXML" = "no"; then   
+    AC_MSG_ERROR([SimpleXML extension requires LIBXML extension, add --enable-libxml])                
+  fi
 
   PHP_SETUP_LIBXML(SIMPLEXML_SHARED_LIBADD, [
     AC_DEFINE(HAVE_SIMPLEXML,1,[ ])
diff --git a/ext/soap/config.m4 b/ext/soap/config.m4
index 73d2b1e673..d4c1a0da9c 100644
--- a/ext/soap/config.m4
+++ b/ext/soap/config.m4
@@ -1,15 +1,20 @@
 dnl $Id$
 dnl config.m4 for extension soap
 
-PHP_ARG_ENABLE(soap, whether to enable soap support,
+PHP_ARG_ENABLE(soap, whether to enable SOAP support,
 [  --enable-soap          Include SOAP support.])
 
 if test -z "$PHP_LIBXML_DIR"; then
   PHP_ARG_WITH(libxml-dir, libxml2 install dir,
-  [  --with-libxml-dir=DIR     XML: libxml2 install prefix], no, no)
+  [  --with-libxml-dir=DIR     SOAP: libxml2 install prefix], no, no)
 fi
 
-if test "$PHP_SOAP" != "no" && test "$PHP_LIBXML" != "no"; then
+if test "$PHP_SOAP" != "no"; then
+
+  if test "$PHP_LIBXML" = "no"; then   
+    AC_MSG_ERROR([SOAP extension requires LIBXML extension, add --enable-libxml])                
+  fi
+
   PHP_SETUP_LIBXML(SOAP_SHARED_LIBADD, [
     AC_DEFINE(HAVE_SOAP,1,[ ])
     PHP_NEW_EXTENSION(soap, soap.c php_encoding.c php_http.c php_packet_soap.c php_schema.c php_sdl.c php_xml.c, $ext_shared)
diff --git a/ext/xml/config.m4 b/ext/xml/config.m4
index 71afc5a5f6..e77cc4035f 100644
--- a/ext/xml/config.m4
+++ b/ext/xml/config.m4
@@ -13,31 +13,37 @@ fi
 PHP_ARG_WITH(libexpat-dir, libexpat install dir,
 [  --with-libexpat-dir=DIR   XML: libexpat install prefix (deprecated)], no, no)
 
-if test "$PHP_XML" != "no" && test "$PHP_LIBXML" != "no" -o "$PHP_LIBEXPAT_DIR" != "no"; then
+if test "$PHP_XML" != "no"; then
+
   dnl 
-  dnl Default to libxml2.
+  dnl Default to libxml2 if --with-libexpat-dir is not used.
   dnl
-  PHP_SETUP_LIBXML(XML_SHARED_LIBADD, [
-    xml_extra_sources="compat.c"
-  ], [
-    if test "$PHP_LIBEXPAT_DIR" = "no"; then
-      AC_MSG_ERROR([xml2-config not found. Use --with-libxml-dir=<DIR>])
+  if test "$PHP_LIBEXPAT_DIR" = "no"; then
+
+    if test "$PHP_LIBXML" = "no"; then
+      AC_MSG_ERROR([XML extension requires LIBXML extension, add --enable-libxml])
     fi
-  ])
+
+    PHP_SETUP_LIBXML(XML_SHARED_LIBADD, [
+      xml_extra_sources="compat.c"
+    ], [
+      AC_MSG_ERROR([xml2-config not found. Use --with-libxml-dir=<DIR>])
+    ])
+  fi
   
   dnl
   dnl Check for expat only if --with-libexpat-dir is used.
   dnl
   if test "$PHP_LIBEXPAT_DIR" != "no"; then
     for i in $PHP_XML $PHP_LIBEXPAT_DIR; do
-      if test -f "$i/$PHP_LIBDIR/libexpat.a" -o -f "$i/$PHP_LIBDIR/libexpat.$SHLIB_SUFFIX_NAME"; then
+      if test -f "$i/$PHP_LIBDIR/libexpat.a" || test -f "$i/$PHP_LIBDIR/libexpat.$SHLIB_SUFFIX_NAME"; then
         EXPAT_DIR=$i
         break
       fi
     done
 
     if test -z "$EXPAT_DIR"; then
-      AC_MSG_ERROR(not found. Please reinstall the expat distribution.)
+      AC_MSG_ERROR([not found. Please reinstall the expat distribution.])
     fi
 
     PHP_ADD_INCLUDE($EXPAT_DIR/include)
diff --git a/ext/xmlreader/config.m4 b/ext/xmlreader/config.m4
index 2de9292ca8..178afe7dff 100644
--- a/ext/xmlreader/config.m4
+++ b/ext/xmlreader/config.m4
@@ -10,7 +10,11 @@ if test -z "$PHP_LIBXML_DIR"; then
   [  --with-libxml-dir=DIR     XMLReader: libxml2 install prefix], no, no)
 fi
 
-if test "$PHP_XMLREADER" != "no" && test "$PHP_LIBXML" != "no"; then
+if test "$PHP_XMLREADER" != "no"; then
+
+  if test "$PHP_LIBXML" = "no"; then
+    AC_MSG_ERROR([XMLReader extension requires LIBXML extension, add --enable-libxml])
+  fi
 
   PHP_SETUP_LIBXML(XMLREADER_SHARED_LIBADD, [
     AC_DEFINE(HAVE_XMLREADER,1,[ ])
diff --git a/ext/xmlrpc/config.m4 b/ext/xmlrpc/config.m4
index 4da58ff848..78e0c79880 100644
--- a/ext/xmlrpc/config.m4
+++ b/ext/xmlrpc/config.m4
@@ -28,20 +28,23 @@ if test "$PHP_XMLRPC" != "no"; then
   AC_DEFINE(HAVE_XMLRPC,1,[ ])
 
   dnl
-  dnl Default to libxml2.
+  dnl Default to libxml2 if --with-expat-dir is not used
   dnl
-  PHP_SETUP_LIBXML(XMLRPC_SHARED_LIBADD, [
-    if test "$PHP_XML" = "no"; then
-      PHP_ADD_SOURCES(ext/xml, compat.c)
-      PHP_ADD_BUILD_DIR(ext/xml)
-    fi
-  ], [
-    if test "$PHP_EXPAT_DIR" = "no"; then
-      AC_MSG_ERROR([xml2-config not found. Use --with-libxml-dir=<DIR>])
+  if test "$PHP_EXPAT_DIR" = "no"; then
+
+    if test "$PHP_LIBXML" = "no"; then
+      AC_MSG_ERROR([XML-RPC extension requires LIBXML extension, add --enable-libxml])
     fi
-  ])
 
-  if test "$PHP_EXPAT_DIR" != "no"; then
+    PHP_SETUP_LIBXML(XMLRPC_SHARED_LIBADD, [
+      if test "$PHP_XML" = "no"; then
+        PHP_ADD_SOURCES(ext/xml, compat.c)
+        PHP_ADD_BUILD_DIR(ext/xml)
+      fi
+    ], [
+      AC_MSG_ERROR([xml2-config not found. Use --with-libxml-dir=<DIR>])
+    ])
+  else
     testval=no
     for i in $PHP_EXPAT_DIR $XMLRPC_DIR /usr/local /usr; do
       if test -f $i/$PHP_LIBDIR/libexpat.a -o -f $i/$PHP_LIBDIR/libexpat.$SHLIB_SUFFIX_NAME; then
@@ -54,7 +57,7 @@ if test "$PHP_XMLRPC" != "no"; then
     done
 
     if test "$testval" = "no"; then
-      AC_MSG_ERROR(XML-RPC support requires libexpat. Use --with-expat-dir=<DIR>)
+      AC_MSG_ERROR([XML-RPC support requires libexpat. Use --with-expat-dir=<DIR> (deprecated!)])
     fi
   fi
 
diff --git a/ext/xsl/config.m4 b/ext/xsl/config.m4
index b1cb844882..abb6df2686 100644
--- a/ext/xsl/config.m4
+++ b/ext/xsl/config.m4
@@ -6,12 +6,16 @@ PHP_ARG_WITH(xsl, for XSL support,
 [  --with-xsl[=DIR]        Include new XSL support (requires libxslt >= 1.0.18).
                           DIR is the libxslt install directory.])
 
-if test "$PHP_XSL" != "no" -a "$PHP_DOM" = "no"; then
-  AC_MSG_ERROR([XSL extension requires DOM extension, add --enable-dom.])
-fi
-
 if test "$PHP_XSL" != "no"; then
 
+  if test "$PHP_LIBXML" = "no"; then
+    AC_MSG_ERROR([XSL extension requires LIBXML extension, add --enable-libxml])
+  fi
+  
+  if test "$PHP_DOM" = "no"; then
+    AC_MSG_ERROR([XSL extension requires DOM extension, add --enable-dom])
+  fi
+
   for i in $PHP_XSL /usr/local /usr; do
     if test -x "$i/bin/xslt-config"; then
       XSLT_CONFIG=$i/bin/xslt-config