cvs: php4 / acinclude.m4 configure.in /build build.mk /bundle/expat .cvsignore Changes README README.php ascii.h asciitab.h config.m4 expat.h
iasciitab.h internal.h latin1tab.h nametab.h utf8tab.h winconfig.h xmlparse.c xmlrole.c xmlrole.h xmltok.c xmltok.h xmltok_impl.c xmltok_impl.h
xmltok_ns.c /bundle/libxml DOCBparser.c HTMLparser.c HTMLtree.c SAX.c c14n.c catalog.c config.m4 debugXML.c encoding.c entities.c error.c globals.c
hash.c libxml.h list.c nanoftp.c nanohttp.c parser.c parserInternals.c stamp-h.in threads.c tree.c trio.c trio.h triodef.h trionan.c trionan.h triop.h
triostr.c triostr.h uri.c valid.c xinclude.c xlink.c xmlIO.c xmlmemory.c xmlreader.c xmlregexp.c xmlschemas.c xmlschemastypes.c xmlunicode.c xpath.c
xpointer.c /bundle/libxml/include win32config.h wsockcompat.h /bundle/libxml/include/libxml DOCBparser.h HTMLparser.h HTMLtree.h Makefile.am
Makefile.in SAX.h c14n.h catalog.h debugXML.h encoding.h entities.h globals.h hash.h list.h nanoftp.h nanohttp.h parser.h parserInternals.h
schemasInternals.h threads.h tree.h uri.h valid.h xinclude.h xlink.h xmlIO.h xmlautomata.h xmlerror.h xmlmemory.h xmlreader.h xmlregexp.h xmlschemas.h
xmlschemastypes.h xmlunicode.h xmlversion.h xmlversion.h.in xpath.h xpathInternals.h xpointer.h /ext/domxml config.m4 /ext/xml config.m4
/ext/xmlrpc config.m4

sniper Mon May 19 11:33:19 2003 EDT Removed files: /php4/bundle/expat .cvsignore Changes README README.php ascii.h asciitab.h config.m4 expat.h iasciitab.h internal.h latin1tab.h nametab.h utf8tab.h winconfig.h xmlparse.c xmlrole.c xmlrole.h xmltok.c xmltok.h xmltok_impl.c xmltok_impl.h xmltok_ns.c /php4/bundle/libxml DOCBparser.c HTMLparser.c HTMLtree.c SAX.c c14n.c catalog.c config.m4 debugXML.c encoding.c entities.c error.c globals.c hash.c libxml.h list.c nanoftp.c nanohttp.c parser.c parserInternals.c stamp-h.in threads.c tree.c trio.c trio.h triodef.h trionan.c trionan.h triop.h triostr.c triostr.h uri.c valid.c xinclude.c xlink.c xmlIO.c xmlmemory.c xmlreader.c xmlregexp.c xmlschemas.c xmlschemastypes.c xmlunicode.c xpath.c xpointer.c /php4/bundle/libxml/include win32config.h wsockcompat.h /php4/bundle/libxml/include/libxml DOCBparser.h HTMLparser.h HTMLtree.h Makefile.am Makefile.in SAX.h c14n.h catalog.h debugXML.h encoding.h entities.h globals.h hash.h list.h nanoftp.h nanohttp.h parser.h parserInternals.h schemasInternals.h threads.h tree.h uri.h valid.h xinclude.h xlink.h xmlIO.h xmlautomata.h xmlerror.h xmlmemory.h xmlreader.h xmlregexp.h xmlschemas.h xmlschemastypes.h xmlunicode.h xmlversion.h xmlversion.h.in xpath.h xpathInternals.h xpointer.h Modified files: /php4 acinclude.m4 configure.in /php4/build build.mk /php4/ext/domxml config.m4 /php4/ext/xml config.m4 /php4/ext/xmlrpc config.m4 Log: - Unbundle libxml and expat. Now this compiles too..

Index: php4/acinclude.m4 diff -u php4/acinclude.m4:1.243 php4/acinclude.m4:1.244 --- php4/acinclude.m4:1.243 Sun May 18 21:33:58 2003 +++ php4/acinclude.m4 Mon May 19 11:33:17 2003 @@ -1,4 +1,4 @@ -dnl $Id: acinclude.m4,v 1.243 2003/05/19 01:33:58 sas Exp $ +dnl $Id: acinclude.m4,v 1.244 2003/05/19 15:33:17 sniper Exp $ dnl dnl This file contains local autoconf functions. @@ -578,23 +578,6 @@ PHP_ARG_ANALYZE($5,[$2],$6) ]) -AC_DEFUN([PHP_ARG_BUNDLE],[ -PHP_REAL_ARG_BUNDLE([$1],[$2],[$3],[$4],PHP_[]translit($1,a-z-,A-Z_),[ifelse($5,,yes,$5)]) -]) - -AC_DEFUN([PHP_REAL_ARG_BUNDLE],[ -ifelse([$2],,,[AC_MSG_CHECKING([$2])]) -AC_ARG_WITH($1,[$3],$5=[$]withval, -[ - $5=ifelse($4,,no,$4) - - if test "$PHP_BUNDLE_ALL" && test "$6" = "yes"; then - $5=$PHP_BUNDLE_ALL - fi -]) -PHP_ARG_ANALYZE($5,[$2],$6) -]) - AC_DEFUN([PHP_MODULE_PTR],[ EXTRA_MODULE_PTRS="$EXTRA_MODULE_PTRS $1," ]) @@ -1713,6 +1696,41 @@ PHP_ADD_INCLUDE($ICONV_DIR/include) fi $2 +ifelse([$3],[],,[else $3]) + fi +]) + +dnl +dnl PHP_SETUP_LIBXML(shared-add [, action-found [, action-not-found]]) +dnl +dnl Common setup macro for libxml +dnl +AC_DEFUN([PHP_SETUP_LIBXML], [ + + for i in $PHP_LIBXML_DIR /usr/local /usr; do + if test -x "$i/bin/xml2-config"; then + XML2_CONFIG="$i/bin/xml2-config" + break + fi + done + + if test -x "$XML2_CONFIG"; then + libxml_full_version=`$XML2_CONFIG --version` + ac_IFS=$IFS + IFS="." + set $libxml_full_version + IFS=$ac_IFS + LIBXML_VERSION=`expr [$]1 \* 1000000 + [$]2 \* 1000 + [$]3` + if test "$LIBXML_VERSION" -ge "2004014"; then + LIBXML_LIBS=`$XML2_CONFIG --libs` + LIBXML_INCS=`$XML2_CONFIG --cflags` + PHP_EVAL_LIBLINE($LIBXML_LIBS, $shared_lib_add) + PHP_EVAL_INCLINE($LIBXML_INCS) + AC_DEFINE(HAVE_LIBXML, 1, [ ]) + $2 + else + AC_MSG_ERROR([libxml2 version 2.4.14 or greater required.]) + fi ifelse([$3],[],,[else $3]) fi ]) Index: php4/configure.in diff -u php4/configure.in:1.444 php4/configure.in:1.445 --- php4/configure.in:1.444 Thu May 1 23:14:00 2003 +++ php4/configure.in Mon May 19 11:33:17 2003 @@ -1,4 +1,4 @@ -dnl ## $Id: configure.in,v 1.444 2003/05/02 03:14:00 sterling Exp $ -*- sh -*- +dnl ## $Id: configure.in,v 1.445 2003/05/19 15:33:17 sniper Exp $ -*- sh -*- dnl ## Process this file with autoconf to produce a configure script. divert(1) @@ -777,16 +777,8 @@ PHP_ENABLE_ALL=$enableval ]) -AC_ARG_ENABLE(bundle-all, -[ --disable-bundle-all Disable all bundled libraries by default. -], [ - PHP_BUNDLE_ALL=$enableval -]) - # reading config stubs esyscmd(./build/config-stubs ext) -esyscmd(./build/config-stubs bundle) - dnl Other settings. dnl ------------------------------------------------------------------------- Index: php4/build/build.mk diff -u php4/build/build.mk:1.19 php4/build/build.mk:1.20 --- php4/build/build.mk:1.19 Thu May 1 23:14:00 2003 +++ php4/build/build.mk Mon May 19 11:33:17 2003 @@ -14,7 +14,7 @@ # | Author: Sascha Schumann <sascha@schumann.cx> | # +----------------------------------------------------------------------+ # -# $Id: build.mk,v 1.19 2003/05/02 03:14:00 sterling Exp $ +# $Id: build.mk,v 1.20 2003/05/19 15:33:17 sniper Exp $ # # # Makefile to generate build tools @@ -36,7 +36,7 @@ @echo makefile_am_files = $(ZENDDIR)/Makefile.am \ TSRM/Makefile.am > $@ @echo config_h_files = $(ZENDDIR)/acconfig.h TSRM/acconfig.h >> $@ - @echo config_m4_files = $(ZENDDIR)/Zend.m4 TSRM/tsrm.m4 TSRM/threads.m4 bundle/*/config*.m4 \ + @echo config_m4_files = $(ZENDDIR)/Zend.m4 TSRM/tsrm.m4 TSRM/threads.m4 \ $(ZENDDIR)/acinclude.m4 ext/*/config*.m4 sapi/*/config.m4 >> $@ $(STAMP): build/buildcheck.sh Index: php4/ext/domxml/config.m4 diff -u php4/ext/domxml/config.m4:1.45 php4/ext/domxml/config.m4:1.46 --- php4/ext/domxml/config.m4:1.45 Sat May 10 21:01:16 2003 +++ php4/ext/domxml/config.m4 Mon May 19 11:33:19 2003 @@ -1,21 +1,7 @@ dnl -dnl $Id: config.m4,v 1.45 2003/05/11 01:01:16 rrichards Exp $ +dnl $Id: config.m4,v 1.46 2003/05/19 15:33:19 sniper Exp $ dnl -PHP_ARG_WITH(dom, for DOM support, -[ --with-dom[=DIR] Include DOM support]) - -if test "$PHP_DOM" != "no"; then - - if test "$PHP_BUNDLE_LIBXML" = "no"; then - AC_MSG_RESULT(not found) - AC_MSG_ERROR(libxml2 required) - fi - - AC_DEFINE(HAVE_DOMXML,1,[ ]) - PHP_NEW_EXTENSION(domxml, php_domxml.c, $ext_shared) -fi - AC_DEFUN(PHP_DOM_XSLT_CHECK_VERSION,[ old_CPPFLAGS=$CPPFLAGS CPPFLAGS=-I$DOMXSLT_DIR/include @@ -50,20 +36,37 @@ CPPFLAGS=$old_CPPFLAGS ]) +PHP_ARG_WITH(dom, for DOM support, +[ --with-dom[=DIR] Include DOM support (requires libxml >= 2.4.14). + DIR is the libxml install directory.]) + +if test "$PHP_DOM" != "no"; then + + PHP_LIBXML_DIR=$PHP_DOM + + PHP_SETUP_LIBXML(DOMXML_SHARED_LIBADD, [ + AC_DEFINE(HAVE_DOMXML,1,[ ]) + PHP_NEW_EXTENSION(domxml, php_domxml.c, $ext_shared) + PHP_SUBST(DOMXML_SHARED_LIBADD) + ], [ + AC_MSG_ERROR([xml2-config not found. Please check your libxml2 installation.]) + ]) +fi + PHP_ARG_WITH(dom-xslt, for DOM XSLT support, [ --with-dom-xslt[=DIR] DOMXML: Include DOM XSLT support (requires libxslt >= 1.0.18). DIR is the libxslt install directory.], no, no) -PHP_ARG_WITH(dom-exslt, for DOM EXSLT support, -[ --with-dom-exslt[=DIR] DOMXML: Include DOM EXSLT support (requires libxslt >= 1.0.18). - DIR is the libexslt install directory.], no, no) - if test "$PHP_DOM_XSLT" != "no"; then - if test -r $PHP_DOM_XSLT/include/libxslt/transform.h; then + if test "$PHP_DOM" = "no"; then + AC_MSG_ERROR([DOMXSLT requires DOMXML. Use --with-dom[=DIR]]) + fi + + if test -r "$PHP_DOM_XSLT/include/libxslt/transform.h"; then DOMXSLT_DIR=$PHP_DOM_XSLT else - for i in /usr/local /usr; do + for i in $PHP_LIBXML_DIR /usr/local /usr; do test -r $i/include/libxslt/transform.h && DOMXSLT_DIR=$i done fi @@ -76,35 +79,34 @@ PHP_DOM_XSLT_CHECK_VERSION PHP_ADD_LIBRARY_WITH_PATH(xslt, $DOMXSLT_DIR/lib, DOMXML_SHARED_LIBADD) - PHP_ADD_INCLUDE($DOMXSLT_DIR/include) - if test "$PHP_DOM" = "no"; then - AC_MSG_ERROR(DOMXSLT requires DOMXML. Use --with-dom) - fi - - if test -f $DOMXSLT_DIR/lib/libxsltbreakpoint.a -o -f $DOMXSLT_DIR/lib/libxsltbreakpoint.$SHLIB_SUFFIX_NAME ; then - PHP_ADD_LIBRARY_WITH_PATH(xsltbreakpoint, $DOMXSLT_DIR/lib, DOMXML_SHARED_LIBADD) + if test -f $PHP_LIBXML_DIR/lib/libxsltbreakpoint.a -o -f $PHP_LIBXML_DIR/lib/libxsltbreakpoint.$SHLIB_SUFFIX_NAME; then + PHP_ADD_LIBRARY_WITH_PATH(xsltbreakpoint, $PHP_LIBXML_DIR/lib, DOMXML_SHARED_LIBADD) fi AC_DEFINE(HAVE_DOMXSLT,1,[ ]) - - PHP_SUBST(DOMXML_SHARED_LIBADD) fi + +PHP_ARG_WITH(dom-exslt, for DOM EXSLT support, +[ --with-dom-exslt[=DIR] DOMXML: Include DOM EXSLT support (requires libxslt >= 1.0.18). + DIR is the libexslt install directory.], no, no) + if test "$PHP_DOM_EXSLT" != "no"; then + if test "$PHP_DOM" = "no"; then - AC_MSG_ERROR(DOMEXSLT requires DOMXML. Use --with-dom=<DIR>) + AC_MSG_ERROR([DOMEXSLT requires DOMXML. Use --with-dom[=DIR]]) fi if test "$PHP_DOM_XSLT" = "no"; then - AC_MSG_ERROR(DOMEXSLT requires DOMXSLT. Use --with-dom-xslt=<DIR>) + AC_MSG_ERROR([DOMEXSLT requires DOMXSLT. Use --with-dom-xslt[=DIR]]) fi - + if test -r $PHP_DOM_EXSLT/include/libexslt/exslt.h; then DOMEXSLT_DIR=$PHP_DOM_EXSLT else - for i in /usr/local /usr; do + for i in $PHP_LIBXML_DIR /usr/local /usr; do test -r $i/include/libexslt/exslt.h && DOMEXSLT_DIR=$i done fi @@ -117,11 +119,7 @@ PHP_DOM_EXSLT_CHECK_VERSION PHP_ADD_LIBRARY_WITH_PATH(exslt, $DOMEXSLT_DIR/lib, DOMXML_SHARED_LIBADD) - PHP_ADD_INCLUDE($DOMEXSLT_DIR/include) - AC_DEFINE(HAVE_DOMEXSLT,1,[ ]) - PHP_SUBST(DOMXML_SHARED_LIBADD) - fi Index: php4/ext/xml/config.m4 diff -u php4/ext/xml/config.m4:1.41 php4/ext/xml/config.m4:1.42 --- php4/ext/xml/config.m4:1.41 Tue May 6 15:38:49 2003 +++ php4/ext/xml/config.m4 Mon May 19 11:33:19 2003 @@ -1,16 +1,55 @@ dnl -dnl $Id: config.m4,v 1.41 2003/05/06 19:38:49 sterling Exp $ +dnl $Id: config.m4,v 1.42 2003/05/19 15:33:19 sniper Exp $ dnl -PHP_ARG_ENABLE(xml,whether to enable XML support, -[ --disable-xml Disable XML support using bundled expat lib], yes) +AC_C_BIGENDIAN -if test "$PHP_XML" = "yes"; then - AC_DEFINE(HAVE_XML, 1, [ ]) +if test "$ac_cv_c_bigendian" = "yes"; then + order=4321 +else + order=1234 +fi - if test "$PHP_BUNDLE_EXPAT" = "no" && test "$PHP_BUNDLE_LIBXML" = "no"; then - AC_MSG_ERROR(xml support is enabled, however both xml libraries have been disabled.) - fi +PHP_ARG_WITH(xml,whether to enable XML support, +[ --without-xml Disable XML support. Requires libxml2.], yes) - PHP_NEW_EXTENSION(xml, compat.c xml.c, $ext_shared) +PHP_ARG_WITH(libxml-dir, libxml install dir, +[ --with-libxml-dir=DIR XML: libxml install prefix], no, no) + +PHP_ARG_WITH(expat-dir, libexpat install dir, +[ --with-expat-dir=DIR XML: libexpat install prefix (deprecated)], no, no) + +if test "$PHP_XML" != "no"; then + + if test "$PHP_XML" != "yes" && test -n "$PHP_LIBXML_DIR"; then + PHP_LIBXML_DIR=$PHP_XML + fi + + PHP_SETUP_LIBXML(XML_SHARED_LIBADD, [ + xml_sources="xml.c compat.c" + ], [ + AC_MSG_ERROR(xml2-config not found. Use --with-libxml-dir=<DIR>) + ]) + + if test "$PHP_EXPAT_DIR" != "no"; then + AC_DEFINE(HAVE_LIBEXPAT, 1, [ ]) + xml_sources="xml.c" + + for i in $PHP_XML $PHP_EXPAT_DIR; do + if test -f "$i/lib/libexpat.a" -o -f "$i/lib/libexpat.$SHLIB_SUFFIX_NAME"; then + EXPAT_DIR=$i + fi + done + + if test -z "$EXPAT_DIR"; then + AC_MSG_ERROR(not found. Please reinstall the expat distribution.) + fi + + PHP_ADD_INCLUDE($EXPAT_DIR/include) + PHP_ADD_LIBRARY_WITH_PATH(expat, $EXPAT_DIR/lib, XML_SHARED_LIBADD) + fi + + PHP_NEW_EXTENSION(xml, $xml_sources, $ext_shared) + PHP_SUBST(XML_SHARED_LIBADD) + AC_DEFINE(HAVE_XML, 1, [ ]) fi Index: php4/ext/xmlrpc/config.m4 diff -u php4/ext/xmlrpc/config.m4:1.18 php4/ext/xmlrpc/config.m4:1.19 --- php4/ext/xmlrpc/config.m4:1.18 Wed Sep 4 14:47:25 2002 +++ php4/ext/xmlrpc/config.m4 Mon May 19 11:33:19 2003 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.18 2002/09/04 18:47:25 sniper Exp $ +dnl $Id: config.m4,v 1.19 2003/05/19 15:33:19 sniper Exp $ dnl sinclude(ext/xmlrpc/libxmlrpc/acinclude.m4) @@ -11,10 +11,10 @@ [ --with-xmlrpc[=DIR] Include XMLRPC-EPI support.]) PHP_ARG_WITH(expat-dir, libexpat dir for XMLRPC-EPI, -[ --with-expat-dir=DIR XMLRPC-EPI: libexpat dir for XMLRPC-EPI.],yes,no) +[ --with-expat-dir=DIR XMLRPC-EPI: libexpat dir for XMLRPC-EPI.],no,no) PHP_ARG_WITH(iconv-dir, iconv dir for XMLRPC-EPI, -[ --with-iconv-dir=DIR XMLRPC-EPI: iconv dir for XMLRPC-EPI.],yes,no) +[ --with-iconv-dir=DIR XMLRPC-EPI: iconv dir for XMLRPC-EPI.],no,no) if test "$PHP_XMLRPC" != "no"; then @@ -87,7 +87,5 @@ PHP_ADD_INCLUDE($XMLRPC_DIR) PHP_ADD_LIBRARY_WITH_PATH(xmlrpc, $XMLRPC_DIR/lib, XMLRPC_SHARED_LIBADD) - fi -