diff options
-rw-r--r-- | ext/dom/config.m4 | 9 | ||||
-rw-r--r-- | ext/libxml/config0.m4 | 9 | ||||
-rw-r--r-- | ext/simplexml/config.m4 | 9 | ||||
-rw-r--r-- | ext/soap/config.m4 | 9 | ||||
-rw-r--r-- | ext/xml/config.m4 | 11 | ||||
-rw-r--r-- | ext/xmlreader/config.m4 | 9 | ||||
-rw-r--r-- | ext/xmlrpc/config.m4 | 11 | ||||
-rw-r--r-- | ext/xmlwriter/config.m4 | 9 |
8 files changed, 2 insertions, 74 deletions
diff --git a/ext/dom/config.m4 b/ext/dom/config.m4 index dc4fccbc45..a2406f54ad 100644 --- a/ext/dom/config.m4 +++ b/ext/dom/config.m4 @@ -6,15 +6,6 @@ PHP_ARG_ENABLE([dom], [Disable DOM support])], [yes]) -if test -z "$PHP_LIBXML_DIR"; then - PHP_ARG_WITH([libxml-dir], - [libxml2 install dir], - [AS_HELP_STRING([[--with-libxml-dir[=DIR]]], - [DOM: libxml2 install prefix])], - [no], - [no]) -fi - if test "$PHP_DOM" != "no"; then if test "$PHP_LIBXML" = "no"; then diff --git a/ext/libxml/config0.m4 b/ext/libxml/config0.m4 index 28fd85dc3c..c16324266e 100644 --- a/ext/libxml/config0.m4 +++ b/ext/libxml/config0.m4 @@ -6,15 +6,6 @@ PHP_ARG_ENABLE([libxml], [Disable LIBXML support])], [yes]) -if test -z "$PHP_LIBXML_DIR"; then - PHP_ARG_WITH([libxml-dir], - [libxml2 install dir], - [AS_HELP_STRING([[--with-libxml-dir[=DIR]]], - [LIBXML: libxml2 install prefix])], - [no], - [no]) -fi - if test "$PHP_LIBXML" != "no"; then dnl This extension can not be build as shared diff --git a/ext/simplexml/config.m4 b/ext/simplexml/config.m4 index a79d6af5e7..1db02c4da2 100644 --- a/ext/simplexml/config.m4 +++ b/ext/simplexml/config.m4 @@ -6,15 +6,6 @@ PHP_ARG_ENABLE([simplexml], [Disable SimpleXML support])], [yes]) -if test -z "$PHP_LIBXML_DIR"; then - PHP_ARG_WITH([libxml-dir], - [libxml2 install dir], - [AS_HELP_STRING([--with-libxml-dir=DIR], - [SimpleXML: libxml2 install prefix])], - [no], - [no]) -fi - if test "$PHP_SIMPLEXML" != "no"; then if test "$PHP_LIBXML" = "no"; then diff --git a/ext/soap/config.m4 b/ext/soap/config.m4 index 8ca7eb3156..8a3d791741 100644 --- a/ext/soap/config.m4 +++ b/ext/soap/config.m4 @@ -5,15 +5,6 @@ PHP_ARG_ENABLE([soap], [AS_HELP_STRING([--enable-soap], [Enable SOAP support])]) -if test -z "$PHP_LIBXML_DIR"; then - PHP_ARG_WITH([libxml-dir], - [libxml2 install dir], - [AS_HELP_STRING([--with-libxml-dir=DIR], - [SOAP: libxml2 install prefix])], - [no], - [no]) -fi - if test "$PHP_SOAP" != "no"; then if test "$PHP_LIBXML" = "no"; then diff --git a/ext/xml/config.m4 b/ext/xml/config.m4 index 45d0ab4214..40110fd9ad 100644 --- a/ext/xml/config.m4 +++ b/ext/xml/config.m4 @@ -6,15 +6,6 @@ PHP_ARG_ENABLE([xml], [Disable XML support])], [yes]) -if test -z "$PHP_LIBXML_DIR"; then - PHP_ARG_WITH([libxml-dir], - [libxml2 install dir], - [AS_HELP_STRING([--with-libxml-dir=DIR], - [XML: libxml2 install prefix])], - [no], - [no]) -fi - PHP_ARG_WITH([libexpat-dir], [libexpat install dir], [AS_HELP_STRING([--with-libexpat-dir=DIR], @@ -37,7 +28,7 @@ if test "$PHP_XML" != "no"; then xml_extra_sources="compat.c" PHP_ADD_EXTENSION_DEP(xml, libxml) ], [ - AC_MSG_ERROR([libxml2 not found. Use --with-libxml-dir=<DIR>]) + AC_MSG_ERROR([libxml2 not found.]) ]) fi diff --git a/ext/xmlreader/config.m4 b/ext/xmlreader/config.m4 index 5bc768a3b0..07be219d42 100644 --- a/ext/xmlreader/config.m4 +++ b/ext/xmlreader/config.m4 @@ -6,15 +6,6 @@ PHP_ARG_ENABLE([xmlreader], [Disable XMLReader support])], [yes]) -if test -z "$PHP_LIBXML_DIR"; then - PHP_ARG_WITH([libxml-dir], - [libxml2 install dir], - [AS_HELP_STRING([--with-libxml-dir=DIR], - [XMLReader: libxml2 install prefix])], - [no], - [no]) -fi - if test "$PHP_XMLREADER" != "no"; then if test "$PHP_LIBXML" = "no"; then diff --git a/ext/xmlrpc/config.m4 b/ext/xmlrpc/config.m4 index cf9a3111e7..caf8c8286a 100644 --- a/ext/xmlrpc/config.m4 +++ b/ext/xmlrpc/config.m4 @@ -10,15 +10,6 @@ PHP_ARG_WITH([xmlrpc], [AS_HELP_STRING([[--with-xmlrpc[=DIR]]], [Include XMLRPC-EPI support])]) -if test -z "$PHP_LIBXML_DIR"; then - PHP_ARG_WITH([libxml-dir], - [libxml2 install dir], - [AS_HELP_STRING([--with-libxml-dir=DIR], - [XMLRPC-EPI: libxml2 install prefix])], - [no], - [no]) -fi - PHP_ARG_WITH([libexpat-dir], [libexpat dir for XMLRPC-EPI], [AS_HELP_STRING([--with-libexpat-dir=DIR], @@ -54,7 +45,7 @@ if test "$PHP_XMLRPC" != "no"; then PHP_ADD_BUILD_DIR(ext/xml) fi ], [ - AC_MSG_ERROR([libxml2 not found. Use --with-libxml-dir=<DIR>]) + AC_MSG_ERROR([libxml2 not found.]) ]) else testval=no diff --git a/ext/xmlwriter/config.m4 b/ext/xmlwriter/config.m4 index c3381db741..73e0bc0438 100644 --- a/ext/xmlwriter/config.m4 +++ b/ext/xmlwriter/config.m4 @@ -6,15 +6,6 @@ PHP_ARG_ENABLE([xmlwriter], [Disable XMLWriter support])], [yes]) -if test -z "$PHP_LIBXML_DIR"; then - PHP_ARG_WITH([libxml-dir], - [libxml2 install dir], - [AS_HELP_STRING([--with-libxml-dir=DIR], - [XMLWriter: libxml2 install prefix])], - [no], - [no]) -fi - if test "$PHP_XMLWRITER" != "no"; then if test "$PHP_LIBXML" = "no"; then |