cvs: /php4/ext/xml/expat Makefile.in /php4/ext/xml/expat/xmlparse Makefile.in /php4/ext/xml/expat/xmltok Makefile.in /php4/ext/xml/expat Makefile
/php4/ext/xml Makefile.in config.m4

sas Sat Feb 12 06:28:50 2000 EDT Added files: /php4/ext/xml/expat Makefile.in /php4/ext/xml/expat/xmlparse Makefile.in /php4/ext/xml/expat/xmltok Makefile.in Removed files: /php4/ext/xml/expat Makefile Modified files: /php4/ext/xml Makefile.in config.m4 Log: Use bundled expat library on UNIX. Note: Need to fix --enable-xml=shared Index: php4/ext/xml/Makefile.in diff -u php4/ext/xml/Makefile.in:1.4 php4/ext/xml/Makefile.in:1.5 --- php4/ext/xml/Makefile.in:1.4 Wed Dec 29 18:59:29 1999 +++ php4/ext/xml/Makefile.in Sat Feb 12 06:28:49 2000 @@ -6,9 +6,10 @@ LTLIBRARY_NAME = libxml.la LTLIBRARY_SOURCES = xml.c +LTLIBRARY_LIBADD = expat/libexpat.la LTLIBRARY_SHARED_NAME = xml.la LTLIBRARY_SHARED_LIBADD = $(XML_LIBS) -EXTRA_INCLUDES = $(XML_INCLUDE) - +SUBDIRS = expat + include $(topsrcdir)/build/ltlib.mk Index: php4/ext/xml/config.m4 diff -u php4/ext/xml/config.m4:1.16 php4/ext/xml/config.m4:1.17 --- php4/ext/xml/config.m4:1.16 Wed Dec 29 20:07:45 1999 +++ php4/ext/xml/config.m4 Sat Feb 12 06:28:49 2000 @@ -1,56 +1,29 @@ # $Source: /local/repository/php4/ext/xml/config.m4,v $ -# $Id: config.m4,v 1.16 1999/12/30 04:07:45 sas Exp $ +# $Id: config.m4,v 1.17 2000/02/12 14:28:49 sas Exp $ +dnl Fallback for --with-xml[=DIR] +AC_ARG_WITH(xml,[],enable_xml=$withval) + +AC_C_BIGENDIAN + AC_MSG_CHECKING(for XML support) -AC_ARG_WITH(xml, -[ --with-xml[=DIR] Include XML support. Will look for expat - in DIR if specified. Set DIR to "shared" to - build as a dl, or "shared,DIR" to build as a dl - and still specify DIR.],[ - PHP_WITH_SHARED - if test "$withval" != "no"; then - if test "$shared" = "yes"; then - AC_MSG_RESULT([yes (shared)]) - else - AC_MSG_RESULT([yes (static)]) - fi +AC_ARG_ENABLE(xml, +[ --enable-xml Include XML support using bundled expat lib],[ + PHP_XML=$enableval +],[ + PHP_XML=no +]) +AC_MSG_RESULT($PHP_XML) - if test -z "$XML_INCLUDE" ; then - if test "$withval" = "yes"; then - test -d /usr/include/xml && XML_INCLUDE="/usr/include/xml" - test -d /usr/local/include/xml && XML_INCLUDE="/usr/local/include/xml" - test -d /usr/include/xmltok && XML_INCLUDE="/usr/include/xmltok" - AC_CHECK_LIB(expat, main, XML_LIBS="-lexpat", - AC_CHECK_LIB(xmltok, main, - AC_CHECK_LIB(xmlparse, main, XML_LIBS="-lxmlparse -lxmltok", - AC_MSG_ERROR(No expat library found for the xml module),"-lxmltok"), - AC_MSG_ERROR(No expat library found for the xml module)) - ) - else - XML_LIBS="-L$withval/lib -lexpat" - if test -d $withval/include/xml; then - XML_INCLUDE="$withval/include/xml" - else - XML_INCLUDE="$withval/include" - fi - fi - fi - AC_DEFINE(HAVE_LIBEXPAT, 1, [ ]) - PHP_EXTENSION(xml, $shared) - if test "$shared" != "yes"; then - EXTRA_LIBS="$EXTRA_LIBS $XML_LIBS" - AC_ADD_INCLUDE($XML_INCLUDE) - XML_INCLUDE="" - XML_STATIC="libphpext_xml.la" - else - XML_INCLUDE="-I$XML_INCLUDE" - XML_SHARED="xml.la" - fi +if test "$PHP_XML" != "no"; then + AC_DEFINE(HAVE_LIBEXPAT, 1, [ ]) + if test "$PHP_XML" = "shared"; then + shared=yes else - AC_MSG_RESULT(no) + shared= fi -],[ - AC_MSG_RESULT(no) -]) -PHP_SUBST(XML_LIBS) -PHP_SUBST(XML_INCLUDE) + PHP_EXTENSION(xml, $shared) + AC_ADD_INCLUDE(${ext_src_base}expat/xmltok) + AC_ADD_INCLUDE(${ext_src_base}expat/xmlparse) + PHP_FAST_OUTPUT(${ext_base}expat/Makefile ${ext_base}expat/xmlparse/Makefile ${ext_base}expat/xmltok/Makefile) +fi