diff options
| author | foobar <sniper@php.net> | 2003-11-12 23:42:38 +0000 |
|---|---|---|
| committer | foobar <sniper@php.net> | 2003-11-12 23:42:38 +0000 |
| commit | 32b5a41941b0e43d96dc0b2f6ea39a7404b35a76 (patch) | |
| tree | 6615d0d165c71b3d3b65e91359568b1a5c9f22f5 | |
| parent | 81d1a19d0b81fc7143aed7af387b921256f1ee31 (diff) | |
| download | php-git-32b5a41941b0e43d96dc0b2f6ea39a7404b35a76.tar.gz | |
- Fixed bug #26072 (--disable-libxml does not work).
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | ext/dom/config.m4 | 4 | ||||
| -rw-r--r-- | ext/libxml/config0.m4 (renamed from ext/libxml/config.m4) | 7 | ||||
| -rw-r--r-- | ext/simplexml/config.m4 | 2 | ||||
| -rw-r--r-- | ext/xml/config.m4 | 4 |
5 files changed, 10 insertions, 8 deletions
@@ -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 489416e97a..41699b0807 100644 --- 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 index 1b9e6886c4..ecab8c1d2f 100644 --- 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 c12ab76350..9fa9c455ed 100644 --- 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 4836373c33..72c98ed814 100644 --- 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 |