- Fixed bug #26072 (--disable-libxml does not work).

diff --git a/NEWS b/NEWS
index 0534a3f058fad897ff03036fa100a528e429fd60..6a5315e8d998fad3021066921b879c64696c68a1 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,7 @@ PHP                                                                        NEWS
 - Added new functions:
   . dba_key_split() to split inifile keys in an array. (Marcus)
   . nanosleep() signal safe sleep (Magnus, Ilia)
+- Fixed bug #26072 (--disable-libxml does not work). (Jani)
 - Fixed bug #26083 (Non-working write support in ext/dom). (Ilia)
 - Fixed bug #24394 (Serializing cross-referenced objects causes segfault).
   (Moriyoshi)

diff --git a/ext/dom/config.m4 b/ext/dom/config.m4
index 489416e97a34b01ca5bdd95d9ec02ce1014a942d..41699b080771ba151d31cafc350360f90f09b96d 100644 (file)
--- a/ext/dom/config.m4
+++ b/ext/dom/config.m4
@@ -10,7 +10,7 @@ if test -z "$PHP_LIBXML_DIR"; then
   [  --with-libxml-dir[=DIR]   DOM: libxml2 install prefix.], no, no)
 fi
 
-if test "$PHP_DOM" != "no"; then
+if test "$PHP_DOM" != "no" && test "$PHP_LIBXML" != "no"; then
 
   PHP_SETUP_LIBXML(DOM_SHARED_LIBADD, [
     AC_DEFINE(HAVE_DOM,1,[ ])
@@ -22,7 +22,7 @@ if test "$PHP_DOM" != "no"; then
                             documenttype.c domimplementationlist.c entity.c \
                             nodelist.c text.c comment.c domconfiguration.c \
                             domimplementationsource.c entityreference.c \
-                           notation.c xpath.c \
+                            notation.c xpath.c \
                             typeinfo.c domerror.c domlocator.c namednodemap.c userdatahandler.c], 
                             $ext_shared)
     PHP_SUBST(DOM_SHARED_LIBADD)

diff --git a/ext/libxml/config.m4 b/ext/libxml/config0.m4
similarity index 80%
rename from ext/libxml/config.m4
rename to ext/libxml/config0.m4
index 1b9e6886c4cecd44127f6041b844f24631dd0881..ecab8c1d2f42401c06606cb2283de972aed9c3eb 100644 (file)
--- a/ext/libxml/config.m4
+++ b/ext/libxml/config0.m4
@@ -12,11 +12,12 @@ fi
 
 if test "$PHP_LIBXML" != "no"; then
 
+  dnl This extension can not be build as shared
+  ext_shared=no
+
   PHP_SETUP_LIBXML(LIBXML_SHARED_LIBADD, [
     AC_DEFINE(HAVE_LIBXML,1,[ ])
-    PHP_NEW_EXTENSION(libxml, [libxml.c], 
-                            $ext_shared)
-    PHP_SUBST(LIBXML_SHARED_LIBADD)
+    PHP_NEW_EXTENSION(libxml, [libxml.c], $ext_shared)
   ], [
     AC_MSG_ERROR([xml2-config not found. Please check your libxml2 installation.])
   ])

diff --git a/ext/simplexml/config.m4 b/ext/simplexml/config.m4
index c12ab763500c3acb9d6cb2cb76f51bc63e1c4ad8..9fa9c455edc2a6d81cc379283432e1fea3434b78 100644 (file)
--- a/ext/simplexml/config.m4
+++ b/ext/simplexml/config.m4
@@ -9,7 +9,7 @@ if test -z "$PHP_LIBXML_DIR"; then
   [  --with-libxml-dir=DIR     SimpleXML: libxml2 install prefix], no, no)
 fi
 
-if test "$PHP_SIMPLEXML" != "no"; then
+if test "$PHP_SIMPLEXML" != "no" && test "$PHP_LIBXML" != "no"; then
 
   PHP_SETUP_LIBXML(SIMPLEXML_SHARED_LIBADD, [
     AC_DEFINE(HAVE_SIMPLEXML,1,[ ])

diff --git a/ext/xml/config.m4 b/ext/xml/config.m4
index 4836373c3313c1c6bac973b9d9a6fdfadcedcd2f..72c98ed8145fca5a8214ab19a0241bdc6613b2e0 100644 (file)
--- a/ext/xml/config.m4
+++ b/ext/xml/config.m4
@@ -13,7 +13,7 @@ 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"; then
+if test "$PHP_XML" != "no" && test "$PHP_LIBXML" != "no" -o "$PHP_LIBEXPAT_DIR" != "no"; then
   dnl 
   dnl Default to libxml2.
   dnl
@@ -24,7 +24,7 @@ if test "$PHP_XML" != "no"; then
       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