sniper Wed Nov 12 18:42:38 2003 EDT
Added files:
/php-src/ext/libxml config0.m4
Removed files:
/php-src/ext/libxml config.m4
Modified files:
/php-src NEWS
/php-src/ext/simplexml config.m4
/php-src/ext/xml config.m4
/php-src/ext/dom config.m4
Log:
- Fixed bug #26072 (--disable-libxml does not work).
Index: php-src/NEWS
diff -u php-src/NEWS:1.1496 php-src/NEWS:1.1497
--- php-src/NEWS:1.1496 Wed Nov 12 17:02:36 2003
+++ php-src/NEWS Wed Nov 12 18:42:35 2003
@@ -4,6 +4,7 @@
- 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)
Index: php-src/ext/simplexml/config.m4
diff -u php-src/ext/simplexml/config.m4:1.6 php-src/ext/simplexml/config.m4:1.7
--- php-src/ext/simplexml/config.m4:1.6 Mon Jun 30 13:23:52 2003
+++ php-src/ext/simplexml/config.m4 Wed Nov 12 18:42:35 2003
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.6 2003/06/30 17:23:52 sniper Exp $
+dnl $Id: config.m4,v 1.7 2003/11/12 23:42:35 sniper Exp $
dnl config.m4 for extension simplexml
PHP_ARG_ENABLE(simplexml, whether to enable simplexml support,
@@ -9,7 +9,7 @@
[ --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,[ ])
Index: php-src/ext/xml/config.m4
diff -u php-src/ext/xml/config.m4:1.47 php-src/ext/xml/config.m4:1.48
--- php-src/ext/xml/config.m4:1.47 Mon Jun 30 13:23:52 2003
+++ php-src/ext/xml/config.m4 Wed Nov 12 18:42:36 2003
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.47 2003/06/30 17:23:52 sniper Exp $
+dnl $Id: config.m4,v 1.48 2003/11/12 23:42:36 sniper Exp $
dnl
PHP_ARG_ENABLE(xml,whether to enable XML support,
@@ -13,7 +13,7 @@
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 @@
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
Index: php-src/ext/dom/config.m4
diff -u php-src/ext/dom/config.m4:1.11 php-src/ext/dom/config.m4:1.12
--- php-src/ext/dom/config.m4:1.11 Thu Jul 24 09:18:40 2003
+++ php-src/ext/dom/config.m4 Wed Nov 12 18:42:37 2003
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.11 2003/07/24 13:18:40 rrichards Exp $
+dnl $Id: config.m4,v 1.12 2003/11/12 23:42:37 sniper Exp $
dnl
PHP_ARG_ENABLE(dom, whether to enable DOM support,
@@ -10,7 +10,7 @@
[ --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 @@
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)
Index: php-src/ext/libxml/config0.m4
+++ php-src/ext/libxml/config0.m4
dnl
dnl $Id: config0.m4,v 1.1 2003/11/12 23:42:38 sniper Exp $
dnl
PHP_ARG_ENABLE(libxml, whether to enable LIBXML support,
[ --disable-libxml Disable new LIBXML support.], yes)
if test -z "$PHP_LIBXML_DIR"; then
PHP_ARG_WITH(libxml-dir, libxml2 install dir,
[ --with-libxml-dir[=DIR] libxml2 install prefix.], no, no)
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)
], [
AC_MSG_ERROR([xml2-config not found. Please check your libxml2 installation.])
])
fi
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
