cvs: php-src(PHP_5_0) /ext/dom config.m4 /ext/simplexml config.m4 /ext/soap config.m4 /ext/xml config.m4 /ext/xsl config.m4

sniper Wed Apr 27 09:13:38 2005 EDT Modified files: (Branch: PHP_5_0) /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/xsl config.m4 Log: MFH http://cvs.php.net/diff.php/php-src/ext/dom/config.m4?r1=1.15&r2=1.15.2.1&ty=u Index: php-src/ext/dom/config.m4 diff -u php-src/ext/dom/config.m4:1.15 php-src/ext/dom/config.m4:1.15.2.1 --- php-src/ext/dom/config.m4:1.15 Sun Dec 7 10:37:30 2003 +++ php-src/ext/dom/config.m4 Wed Apr 27 09:13:37 2005 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.15 2003/12/07 15:37:30 sniper Exp $ +dnl $Id: config.m4,v 1.15.2.1 2005/04/27 13:13:37 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.7&r2=1.7.2.1&ty=u Index: php-src/ext/simplexml/config.m4 diff -u php-src/ext/simplexml/config.m4:1.7 php-src/ext/simplexml/config.m4:1.7.2.1 --- php-src/ext/simplexml/config.m4:1.7 Wed Nov 12 18:42:35 2003 +++ php-src/ext/simplexml/config.m4 Wed Apr 27 09:13:38 2005 @@ -1,15 +1,19 @@ -dnl $Id: config.m4,v 1.7 2003/11/12 23:42:35 sniper Exp $ +dnl $Id: config.m4,v 1.7.2.1 2005/04/27 13:13:38 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.8.2.1&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.8.2.1 --- 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:13:38 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.8.2.1 2005/04/27 13:13:38 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.48&r2=1.48.2.1&ty=u Index: php-src/ext/xml/config.m4 diff -u php-src/ext/xml/config.m4:1.48 php-src/ext/xml/config.m4:1.48.2.1 --- php-src/ext/xml/config.m4:1.48 Wed Nov 12 18:42:36 2003 +++ php-src/ext/xml/config.m4 Wed Apr 27 09:13:38 2005 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.48 2003/11/12 23:42:36 sniper Exp $ +dnl $Id: config.m4,v 1.48.2.1 2005/04/27 13:13:38 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/lib/libexpat.a" -o -f "$i/lib/libexpat.$SHLIB_SUFFIX_NAME"; then + if test -f "$i/lib/libexpat.a" || test -f "$i/lib/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/xsl/config.m4?r1=1.7&r2=1.7.2.1&ty=u Index: php-src/ext/xsl/config.m4 diff -u php-src/ext/xsl/config.m4:1.7 php-src/ext/xsl/config.m4:1.7.2.1 --- php-src/ext/xsl/config.m4:1.7 Wed Nov 19 07:07:59 2003 +++ php-src/ext/xsl/config.m4 Wed Apr 27 09:13:38 2005 @@ -1,17 +1,21 @@ dnl -dnl $Id: config.m4,v 1.7 2003/11/19 12:07:59 chregu Exp $ +dnl $Id: config.m4,v 1.7.2.1 2005/04/27 13:13:38 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