sniper Wed Apr 27 09:12:55 2005 EDT
Modified files:
/php-src/ext/dom config.m4
/php-src/ext/simplexml config.m4
/php-src/ext/soap config.m4
/php-src/ext/xml config.m4
/php-src/ext/xmlreader config.m4
/php-src/ext/xmlrpc config.m4
/php-src/ext/xsl config.m4
Log:
- Made the libxml related stuff to error out if someone does --disable-all
or --disable-libxml. Better than silently just leave the ext out..
http://cvs.php.net/diff.php/php-src/ext/dom/config.m4?r1=1.17&r2=1.18&ty=u
Index: php-src/ext/dom/config.m4
diff -u php-src/ext/dom/config.m4:1.17 php-src/ext/dom/config.m4:1.18
--- php-src/ext/dom/config.m4:1.17 Mon Feb 14 20:44:10 2005
+++ php-src/ext/dom/config.m4 Wed Apr 27 09:12:54 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.17 2005/02/15 01:44:10 sniper Exp $
+dnl $Id: config.m4,v 1.18 2005/04/27 13:12:54 sniper Exp $
dnl
PHP_ARG_ENABLE(dom, whether to enable DOM support,
@@ -10,7 +10,11 @@
[ --with-libxml-dir[=DIR] DOM: libxml2 install prefix.], no, no)
fi
-if test "$PHP_DOM" != "no" && test "$PHP_LIBXML" != "no"; then
+if test "$PHP_DOM" != "no"; then
+
+ if test "$PHP_LIBXML" = "no"; then
+ AC_MSG_ERROR([DOM extension requires LIBXML extension, add
--enable-libxml])
+ fi
PHP_SETUP_LIBXML(DOM_SHARED_LIBADD, [
AC_DEFINE(HAVE_DOM,1,[ ])
http://cvs.php.net/diff.php/php-src/ext/simplexml/config.m4?r1=1.8&r2=1.9&ty=u
Index: php-src/ext/simplexml/config.m4
diff -u php-src/ext/simplexml/config.m4:1.8 php-src/ext/simplexml/config.m4:1.9
--- php-src/ext/simplexml/config.m4:1.8 Sun Jul 18 08:03:51 2004
+++ php-src/ext/simplexml/config.m4 Wed Apr 27 09:12:54 2005
@@ -1,15 +1,19 @@
-dnl $Id: config.m4,v 1.8 2004/07/18 12:03:51 wez Exp $
+dnl $Id: config.m4,v 1.9 2005/04/27 13:12:54 sniper Exp $
dnl config.m4 for extension simplexml
-PHP_ARG_ENABLE(simplexml, whether to enable simplexml support,
-[ --disable-simplexml Disable simplexml support], yes)
+PHP_ARG_ENABLE(simplexml, whether to enable SimpleXML support,
+[ --disable-simplexml Disable SimpleXML support], yes)
if test -z "$PHP_LIBXML_DIR"; then
PHP_ARG_WITH(libxml-dir, libxml2 install dir,
[ --with-libxml-dir=DIR SimpleXML: libxml2 install prefix], no, no)
fi
-if test "$PHP_SIMPLEXML" != "no" && test "$PHP_LIBXML" != "no"; then
+if test "$PHP_SIMPLEXML" != "no"; then
+
+ if test "$PHP_LIBXML" = "no"; then
+ AC_MSG_ERROR([SimpleXML extension requires LIBXML extension, add
--enable-libxml])
+ fi
PHP_SETUP_LIBXML(SIMPLEXML_SHARED_LIBADD, [
AC_DEFINE(HAVE_SIMPLEXML,1,[ ])
http://cvs.php.net/diff.php/php-src/ext/soap/config.m4?r1=1.8&r2=1.9&ty=u
Index: php-src/ext/soap/config.m4
diff -u php-src/ext/soap/config.m4:1.8 php-src/ext/soap/config.m4:1.9
--- php-src/ext/soap/config.m4:1.8 Fri Feb 6 09:59:51 2004
+++ php-src/ext/soap/config.m4 Wed Apr 27 09:12:55 2005
@@ -1,15 +1,20 @@
-dnl $Id: config.m4,v 1.8 2004/02/06 14:59:51 sniper Exp $
+dnl $Id: config.m4,v 1.9 2005/04/27 13:12:55 sniper Exp $
dnl config.m4 for extension soap
-PHP_ARG_ENABLE(soap, whether to enable soap support,
+PHP_ARG_ENABLE(soap, whether to enable SOAP support,
[ --enable-soap Include SOAP support.])
if test -z "$PHP_LIBXML_DIR"; then
PHP_ARG_WITH(libxml-dir, libxml2 install dir,
- [ --with-libxml-dir=DIR XML: libxml2 install prefix], no, no)
+ [ --with-libxml-dir=DIR SOAP: libxml2 install prefix], no, no)
fi
-if test "$PHP_SOAP" != "no" && test "$PHP_LIBXML" != "no"; then
+if test "$PHP_SOAP" != "no"; then
+
+ if test "$PHP_LIBXML" = "no"; then
+ AC_MSG_ERROR([SOAP extension requires LIBXML extension, add
--enable-libxml])
+ fi
+
PHP_SETUP_LIBXML(SOAP_SHARED_LIBADD, [
AC_DEFINE(HAVE_SOAP,1,[ ])
PHP_NEW_EXTENSION(soap, soap.c php_encoding.c php_http.c php_packet_soap.c
php_schema.c php_sdl.c php_xml.c, $ext_shared)
http://cvs.php.net/diff.php/php-src/ext/xml/config.m4?r1=1.50&r2=1.51&ty=u
Index: php-src/ext/xml/config.m4
diff -u php-src/ext/xml/config.m4:1.50 php-src/ext/xml/config.m4:1.51
--- php-src/ext/xml/config.m4:1.50 Wed Nov 3 09:32:52 2004
+++ php-src/ext/xml/config.m4 Wed Apr 27 09:12:55 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.50 2004/11/03 14:32:52 jorton Exp $
+dnl $Id: config.m4,v 1.51 2005/04/27 13:12:55 sniper Exp $
dnl
PHP_ARG_ENABLE(xml,whether to enable XML support,
@@ -13,31 +13,37 @@
PHP_ARG_WITH(libexpat-dir, libexpat install dir,
[ --with-libexpat-dir=DIR XML: libexpat install prefix (deprecated)], no,
no)
-if test "$PHP_XML" != "no" && test "$PHP_LIBXML" != "no" -o
"$PHP_LIBEXPAT_DIR" != "no"; then
+if test "$PHP_XML" != "no"; then
+
dnl
- dnl Default to libxml2.
+ dnl Default to libxml2 if --with-libexpat-dir is not used.
dnl
- PHP_SETUP_LIBXML(XML_SHARED_LIBADD, [
- xml_extra_sources="compat.c"
- ], [
- if test "$PHP_LIBEXPAT_DIR" = "no"; then
- AC_MSG_ERROR([xml2-config not found. Use --with-libxml-dir=<DIR>])
+ if test "$PHP_LIBEXPAT_DIR" = "no"; then
+
+ if test "$PHP_LIBXML" = "no"; then
+ AC_MSG_ERROR([XML extension requires LIBXML extension, add
--enable-libxml])
fi
- ])
+
+ PHP_SETUP_LIBXML(XML_SHARED_LIBADD, [
+ xml_extra_sources="compat.c"
+ ], [
+ 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
if test "$PHP_LIBEXPAT_DIR" != "no"; then
for i in $PHP_XML $PHP_LIBEXPAT_DIR; do
- if test -f "$i/$PHP_LIBDIR/libexpat.a" -o -f
"$i/$PHP_LIBDIR/libexpat.$SHLIB_SUFFIX_NAME"; then
+ if test -f "$i/$PHP_LIBDIR/libexpat.a" || test -f
"$i/$PHP_LIBDIR/libexpat.$SHLIB_SUFFIX_NAME"; then
EXPAT_DIR=$i
break
fi
done
if test -z "$EXPAT_DIR"; then
- AC_MSG_ERROR(not found. Please reinstall the expat distribution.)
+ AC_MSG_ERROR([not found. Please reinstall the expat distribution.])
fi
PHP_ADD_INCLUDE($EXPAT_DIR/include)
http://cvs.php.net/diff.php/php-src/ext/xmlreader/config.m4?r1=1.1&r2=1.2&ty=u
Index: php-src/ext/xmlreader/config.m4
diff -u php-src/ext/xmlreader/config.m4:1.1 php-src/ext/xmlreader/config.m4:1.2
--- php-src/ext/xmlreader/config.m4:1.1 Mon Apr 19 14:55:02 2004
+++ php-src/ext/xmlreader/config.m4 Wed Apr 27 09:12:55 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.1 2004/04/19 18:55:02 rrichards Exp $
+dnl $Id: config.m4,v 1.2 2005/04/27 13:12:55 sniper Exp $
dnl
PHP_ARG_WITH(xmlreader, for XMLReader support,
@@ -10,7 +10,11 @@
[ --with-libxml-dir=DIR XMLReader: libxml2 install prefix], no, no)
fi
-if test "$PHP_XMLREADER" != "no" && test "$PHP_LIBXML" != "no"; then
+if test "$PHP_XMLREADER" != "no"; then
+
+ if test "$PHP_LIBXML" = "no"; then
+ AC_MSG_ERROR([XMLReader extension requires LIBXML extension, add
--enable-libxml])
+ fi
PHP_SETUP_LIBXML(XMLREADER_SHARED_LIBADD, [
AC_DEFINE(HAVE_XMLREADER,1,[ ])
http://cvs.php.net/diff.php/php-src/ext/xmlrpc/config.m4?r1=1.23&r2=1.24&ty=u
Index: php-src/ext/xmlrpc/config.m4
diff -u php-src/ext/xmlrpc/config.m4:1.23 php-src/ext/xmlrpc/config.m4:1.24
--- php-src/ext/xmlrpc/config.m4:1.23 Fri Mar 25 22:13:58 2005
+++ php-src/ext/xmlrpc/config.m4 Wed Apr 27 09:12:55 2005
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.23 2005/03/26 03:13:58 sniper Exp $
+dnl $Id: config.m4,v 1.24 2005/04/27 13:12:55 sniper Exp $
dnl
sinclude(ext/xmlrpc/libxmlrpc/acinclude.m4)
@@ -28,20 +28,23 @@
AC_DEFINE(HAVE_XMLRPC,1,[ ])
dnl
- dnl Default to libxml2.
+ dnl Default to libxml2 if --with-expat-dir is not used
dnl
- PHP_SETUP_LIBXML(XMLRPC_SHARED_LIBADD, [
- if test "$PHP_XML" = "no"; then
- PHP_ADD_SOURCES(ext/xml, compat.c)
- PHP_ADD_BUILD_DIR(ext/xml)
- fi
- ], [
- if test "$PHP_EXPAT_DIR" = "no"; then
- AC_MSG_ERROR([xml2-config not found. Use --with-libxml-dir=<DIR>])
+ if test "$PHP_EXPAT_DIR" = "no"; then
+
+ if test "$PHP_LIBXML" = "no"; then
+ AC_MSG_ERROR([XML-RPC extension requires LIBXML extension, add
--enable-libxml])
fi
- ])
- if test "$PHP_EXPAT_DIR" != "no"; then
+ PHP_SETUP_LIBXML(XMLRPC_SHARED_LIBADD, [
+ if test "$PHP_XML" = "no"; then
+ PHP_ADD_SOURCES(ext/xml, compat.c)
+ PHP_ADD_BUILD_DIR(ext/xml)
+ fi
+ ], [
+ AC_MSG_ERROR([xml2-config not found. Use --with-libxml-dir=<DIR>])
+ ])
+ else
testval=no
for i in $PHP_EXPAT_DIR $XMLRPC_DIR /usr/local /usr; do
if test -f $i/$PHP_LIBDIR/libexpat.a -o -f
$i/$PHP_LIBDIR/libexpat.$SHLIB_SUFFIX_NAME; then
@@ -54,7 +57,7 @@
done
if test "$testval" = "no"; then
- AC_MSG_ERROR(XML-RPC support requires libexpat. Use
--with-expat-dir=<DIR>)
+ AC_MSG_ERROR([XML-RPC support requires libexpat. Use
--with-expat-dir=<DIR> (deprecated!)])
fi
fi
http://cvs.php.net/diff.php/php-src/ext/xsl/config.m4?r1=1.9&r2=1.10&ty=u
Index: php-src/ext/xsl/config.m4
diff -u php-src/ext/xsl/config.m4:1.9 php-src/ext/xsl/config.m4:1.10
--- php-src/ext/xsl/config.m4:1.9 Wed Nov 3 09:32:52 2004
+++ php-src/ext/xsl/config.m4 Wed Apr 27 09:12:55 2005
@@ -1,17 +1,21 @@
dnl
-dnl $Id: config.m4,v 1.9 2004/11/03 14:32:52 jorton Exp $
+dnl $Id: config.m4,v 1.10 2005/04/27 13:12:55 sniper Exp $
dnl
PHP_ARG_WITH(xsl, for XSL support,
[ --with-xsl[=DIR] Include new XSL support (requires libxslt >=
1.0.18).
DIR is the libxslt install directory.])
-if test "$PHP_XSL" != "no" -a "$PHP_DOM" = "no"; then
- AC_MSG_ERROR([XSL extension requires DOM extension, add --enable-dom.])
-fi
-
if test "$PHP_XSL" != "no"; then
+ if test "$PHP_LIBXML" = "no"; then
+ AC_MSG_ERROR([XSL extension requires LIBXML extension, add
--enable-libxml])
+ fi
+
+ if test "$PHP_DOM" = "no"; then
+ AC_MSG_ERROR([XSL extension requires DOM extension, add --enable-dom])
+ fi
+
for i in $PHP_XSL /usr/local /usr; do
if test -x "$i/bin/xslt-config"; then
XSLT_CONFIG=$i/bin/xslt-config
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
