From 9f0c9b7ad6316b6185a2fc2997bf241785c30120 Mon Sep 17 00:00:00 2001
From: Hugh McMaster <hugh.mcmaster@outlook.com>
Date: Thu, 18 Apr 2019 20:09:01 +1000
Subject: [PATCH] Rename --enable-libxml to --with-libxml to meet naming
 guidelines

---
 UPGRADING               | 4 ++++
 ext/dom/config.m4       | 2 +-
 ext/libxml/config0.m4   | 8 ++++----
 ext/simplexml/config.m4 | 2 +-
 ext/soap/config.m4      | 2 +-
 ext/xml/config.m4       | 2 +-
 ext/xmlreader/config.m4 | 2 +-
 ext/xmlrpc/config.m4    | 2 +-
 ext/xmlwriter/config.m4 | 2 +-
 ext/xsl/config.m4       | 2 +-
 10 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/UPGRADING b/UPGRADING
index 33704bdb02..b4f8a6af15 100644
--- a/UPGRADING
+++ b/UPGRADING
@@ -441,6 +441,10 @@ The following extensions are affected:
   . --with-webp-dir becomes --with-webp.
   . --with-xpm-dir becomes --with-xpm.
 
+- Libxml:
+  . --with-libxml-dir has been removed.
+  . --enable-libxml becomes --with-libxml.
+
 ========================================
 14. Other Changes
 ========================================
diff --git a/ext/dom/config.m4 b/ext/dom/config.m4
index a14f27254a..c7ebb20f81 100644
--- a/ext/dom/config.m4
+++ b/ext/dom/config.m4
@@ -9,7 +9,7 @@ PHP_ARG_ENABLE([dom],
 if test "$PHP_DOM" != "no"; then
 
   if test "$PHP_LIBXML" = "no"; then
-    AC_MSG_ERROR([DOM extension requires LIBXML extension, add --enable-libxml])
+    AC_MSG_ERROR([DOM extension requires LIBXML extension, add --with-libxml])
   fi
 
   PHP_SETUP_LIBXML(DOM_SHARED_LIBADD, [
diff --git a/ext/libxml/config0.m4 b/ext/libxml/config0.m4
index 2712010323..98d5134f36 100644
--- a/ext/libxml/config0.m4
+++ b/ext/libxml/config0.m4
@@ -1,9 +1,9 @@
 dnl config.m4 for extension libxml
 
-PHP_ARG_ENABLE([libxml],
-  [whether to enable LIBXML support],
-  [AS_HELP_STRING([--disable-libxml],
-    [Disable LIBXML support])],
+PHP_ARG_WITH([libxml],
+  [whether to build with LIBXML support],
+  [AS_HELP_STRING([--without-libxml],
+    [Build without LIBXML support])],
   [yes])
 
 if test "$PHP_LIBXML" != "no"; then
diff --git a/ext/simplexml/config.m4 b/ext/simplexml/config.m4
index d9fe11f8bf..e591cb90dc 100644
--- a/ext/simplexml/config.m4
+++ b/ext/simplexml/config.m4
@@ -9,7 +9,7 @@ PHP_ARG_ENABLE([simplexml],
 if test "$PHP_SIMPLEXML" != "no"; then
 
   if test "$PHP_LIBXML" = "no"; then
-    AC_MSG_ERROR([SimpleXML extension requires LIBXML extension, add --enable-libxml])
+    AC_MSG_ERROR([SimpleXML extension requires LIBXML extension, add --with-libxml])
   fi
 
   PHP_SETUP_LIBXML(SIMPLEXML_SHARED_LIBADD, [
diff --git a/ext/soap/config.m4 b/ext/soap/config.m4
index 0664fb886c..833af7b7ac 100644
--- a/ext/soap/config.m4
+++ b/ext/soap/config.m4
@@ -8,7 +8,7 @@ PHP_ARG_ENABLE([soap],
 if test "$PHP_SOAP" != "no"; then
 
   if test "$PHP_LIBXML" = "no"; then
-    AC_MSG_ERROR([SOAP extension requires LIBXML extension, add --enable-libxml])
+    AC_MSG_ERROR([SOAP extension requires LIBXML extension, add --with-libxml])
   fi
 
   PHP_SETUP_LIBXML(SOAP_SHARED_LIBADD, [
diff --git a/ext/xml/config.m4 b/ext/xml/config.m4
index 7c039efd81..ce18d37f8e 100644
--- a/ext/xml/config.m4
+++ b/ext/xml/config.m4
@@ -21,7 +21,7 @@ if test "$PHP_XML" != "no"; then
   if test "$PHP_LIBEXPAT_DIR" = "no"; then
 
     if test "$PHP_LIBXML" = "no"; then
-      AC_MSG_ERROR([XML extension requires LIBXML extension, add --enable-libxml])
+      AC_MSG_ERROR([XML extension requires LIBXML extension, add --with-libxml])
     fi
 
     PHP_SETUP_LIBXML(XML_SHARED_LIBADD, [
diff --git a/ext/xmlreader/config.m4 b/ext/xmlreader/config.m4
index d960839966..616bd9bb84 100644
--- a/ext/xmlreader/config.m4
+++ b/ext/xmlreader/config.m4
@@ -9,7 +9,7 @@ PHP_ARG_ENABLE([xmlreader],
 if test "$PHP_XMLREADER" != "no"; then
 
   if test "$PHP_LIBXML" = "no"; then
-    AC_MSG_ERROR([XMLReader extension requires LIBXML extension, add --enable-libxml])
+    AC_MSG_ERROR([XMLReader extension requires LIBXML extension, add --with-libxml])
   fi
 
   PHP_SETUP_LIBXML(XMLREADER_SHARED_LIBADD, [
diff --git a/ext/xmlrpc/config.m4 b/ext/xmlrpc/config.m4
index c7ab37c897..f7d8ca45f7 100644
--- a/ext/xmlrpc/config.m4
+++ b/ext/xmlrpc/config.m4
@@ -36,7 +36,7 @@ if test "$PHP_XMLRPC" != "no"; then
   if test "$PHP_LIBEXPAT_DIR" = "no"; then
 
     if test "$PHP_LIBXML" = "no"; then
-      AC_MSG_ERROR([XML-RPC extension requires LIBXML extension, add --enable-libxml])
+      AC_MSG_ERROR([XML-RPC extension requires LIBXML extension, add --with-libxml])
     fi
 
     PHP_SETUP_LIBXML(XMLRPC_SHARED_LIBADD, [
diff --git a/ext/xmlwriter/config.m4 b/ext/xmlwriter/config.m4
index 142420b20e..54204f1280 100644
--- a/ext/xmlwriter/config.m4
+++ b/ext/xmlwriter/config.m4
@@ -9,7 +9,7 @@ PHP_ARG_ENABLE([xmlwriter],
 if test "$PHP_XMLWRITER" != "no"; then
 
   if test "$PHP_LIBXML" = "no"; then
-    AC_MSG_ERROR([XMLWriter extension requires LIBXML extension, add --enable-libxml])
+    AC_MSG_ERROR([XMLWriter extension requires LIBXML extension, add --with-libxml])
   fi
 
   PHP_SETUP_LIBXML(XMLWRITER_SHARED_LIBADD, [
diff --git a/ext/xsl/config.m4 b/ext/xsl/config.m4
index 733ff89d17..5109d62895 100644
--- a/ext/xsl/config.m4
+++ b/ext/xsl/config.m4
@@ -9,7 +9,7 @@ PHP_ARG_WITH([xsl],
 if test "$PHP_XSL" != "no"; then
 
   if test "$PHP_LIBXML" = "no"; then
-    AC_MSG_ERROR([XSL extension requires LIBXML extension, add --enable-libxml])
+    AC_MSG_ERROR([XSL extension requires LIBXML extension, add --with-libxml])
   fi
 
   if test "$PHP_DOM" = "no"; then
-- 
2.40.0