Skip to content

Commit 29d1b7f

Browse files
hughmcmasternikic
authored andcommitted
Remove support for --with-libxml-dir
1 parent 05c2e87 commit 29d1b7f

File tree

8 files changed

+2
-74
lines changed

8 files changed

+2
-74
lines changed

ext/dom/config.m4

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,6 @@ PHP_ARG_ENABLE([dom],
66
[Disable DOM support])],
77
[yes])
88

9-
if test -z "$PHP_LIBXML_DIR"; then
10-
PHP_ARG_WITH([libxml-dir],
11-
[libxml2 install dir],
12-
[AS_HELP_STRING([[--with-libxml-dir[=DIR]]],
13-
[DOM: libxml2 install prefix])],
14-
[no],
15-
[no])
16-
fi
17-
189
if test "$PHP_DOM" != "no"; then
1910

2011
if test "$PHP_LIBXML" = "no"; then

ext/libxml/config0.m4

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,6 @@ PHP_ARG_ENABLE([libxml],
66
[Disable LIBXML support])],
77
[yes])
88

9-
if test -z "$PHP_LIBXML_DIR"; then
10-
PHP_ARG_WITH([libxml-dir],
11-
[libxml2 install dir],
12-
[AS_HELP_STRING([[--with-libxml-dir[=DIR]]],
13-
[LIBXML: libxml2 install prefix])],
14-
[no],
15-
[no])
16-
fi
17-
189
if test "$PHP_LIBXML" != "no"; then
1910

2011
dnl This extension can not be build as shared

ext/simplexml/config.m4

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,6 @@ PHP_ARG_ENABLE([simplexml],
66
[Disable SimpleXML support])],
77
[yes])
88

9-
if test -z "$PHP_LIBXML_DIR"; then
10-
PHP_ARG_WITH([libxml-dir],
11-
[libxml2 install dir],
12-
[AS_HELP_STRING([--with-libxml-dir=DIR],
13-
[SimpleXML: libxml2 install prefix])],
14-
[no],
15-
[no])
16-
fi
17-
189
if test "$PHP_SIMPLEXML" != "no"; then
1910

2011
if test "$PHP_LIBXML" = "no"; then

ext/soap/config.m4

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,6 @@ PHP_ARG_ENABLE([soap],
55
[AS_HELP_STRING([--enable-soap],
66
[Enable SOAP support])])
77

8-
if test -z "$PHP_LIBXML_DIR"; then
9-
PHP_ARG_WITH([libxml-dir],
10-
[libxml2 install dir],
11-
[AS_HELP_STRING([--with-libxml-dir=DIR],
12-
[SOAP: libxml2 install prefix])],
13-
[no],
14-
[no])
15-
fi
16-
178
if test "$PHP_SOAP" != "no"; then
189

1910
if test "$PHP_LIBXML" = "no"; then

ext/xml/config.m4

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,6 @@ PHP_ARG_ENABLE([xml],
66
[Disable XML support])],
77
[yes])
88

9-
if test -z "$PHP_LIBXML_DIR"; then
10-
PHP_ARG_WITH([libxml-dir],
11-
[libxml2 install dir],
12-
[AS_HELP_STRING([--with-libxml-dir=DIR],
13-
[XML: libxml2 install prefix])],
14-
[no],
15-
[no])
16-
fi
17-
189
PHP_ARG_WITH([libexpat-dir],
1910
[libexpat install dir],
2011
[AS_HELP_STRING([--with-libexpat-dir=DIR],
@@ -37,7 +28,7 @@ if test "$PHP_XML" != "no"; then
3728
xml_extra_sources="compat.c"
3829
PHP_ADD_EXTENSION_DEP(xml, libxml)
3930
], [
40-
AC_MSG_ERROR([libxml2 not found. Use --with-libxml-dir=<DIR>])
31+
AC_MSG_ERROR([libxml2 not found.])
4132
])
4233
fi
4334

ext/xmlreader/config.m4

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,6 @@ PHP_ARG_ENABLE([xmlreader],
66
[Disable XMLReader support])],
77
[yes])
88

9-
if test -z "$PHP_LIBXML_DIR"; then
10-
PHP_ARG_WITH([libxml-dir],
11-
[libxml2 install dir],
12-
[AS_HELP_STRING([--with-libxml-dir=DIR],
13-
[XMLReader: libxml2 install prefix])],
14-
[no],
15-
[no])
16-
fi
17-
189
if test "$PHP_XMLREADER" != "no"; then
1910

2011
if test "$PHP_LIBXML" = "no"; then

ext/xmlrpc/config.m4

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,6 @@ PHP_ARG_WITH([xmlrpc],
1010
[AS_HELP_STRING([[--with-xmlrpc[=DIR]]],
1111
[Include XMLRPC-EPI support])])
1212

13-
if test -z "$PHP_LIBXML_DIR"; then
14-
PHP_ARG_WITH([libxml-dir],
15-
[libxml2 install dir],
16-
[AS_HELP_STRING([--with-libxml-dir=DIR],
17-
[XMLRPC-EPI: libxml2 install prefix])],
18-
[no],
19-
[no])
20-
fi
21-
2213
PHP_ARG_WITH([libexpat-dir],
2314
[libexpat dir for XMLRPC-EPI],
2415
[AS_HELP_STRING([--with-libexpat-dir=DIR],
@@ -54,7 +45,7 @@ if test "$PHP_XMLRPC" != "no"; then
5445
PHP_ADD_BUILD_DIR(ext/xml)
5546
fi
5647
], [
57-
AC_MSG_ERROR([libxml2 not found. Use --with-libxml-dir=<DIR>])
48+
AC_MSG_ERROR([libxml2 not found.])
5849
])
5950
else
6051
testval=no

ext/xmlwriter/config.m4

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,6 @@ PHP_ARG_ENABLE([xmlwriter],
66
[Disable XMLWriter support])],
77
[yes])
88

9-
if test -z "$PHP_LIBXML_DIR"; then
10-
PHP_ARG_WITH([libxml-dir],
11-
[libxml2 install dir],
12-
[AS_HELP_STRING([--with-libxml-dir=DIR],
13-
[XMLWriter: libxml2 install prefix])],
14-
[no],
15-
[no])
16-
fi
17-
189
if test "$PHP_XMLWRITER" != "no"; then
1910

2011
if test "$PHP_LIBXML" = "no"; then

0 commit comments

Comments
 (0)