diff options
| -rw-r--r-- | ext/xml/Makefile.in | 5 | ||||
| -rw-r--r-- | ext/xml/config.m4 | 71 | ||||
| -rw-r--r-- | ext/xml/expat/Makefile | 39 | ||||
| -rw-r--r-- | ext/xml/expat/Makefile.in | 13 | ||||
| -rw-r--r-- | ext/xml/expat/xmlparse/Makefile.in | 12 | ||||
| -rw-r--r-- | ext/xml/expat/xmltok/Makefile.in | 10 |
6 files changed, 60 insertions, 90 deletions
diff --git a/ext/xml/Makefile.in b/ext/xml/Makefile.in index 634eede7aa..dc13b5451c 100644 --- a/ext/xml/Makefile.in +++ b/ext/xml/Makefile.in @@ -6,9 +6,10 @@ VPATH = @srcdir@ 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 diff --git a/ext/xml/config.m4 b/ext/xml/config.m4 index a346e05598..e3bed63ea7 100644 --- a/ext/xml/config.m4 +++ b/ext/xml/config.m4 @@ -1,56 +1,29 @@ # $Source$ # $Id$ +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 diff --git a/ext/xml/expat/Makefile b/ext/xml/expat/Makefile deleted file mode 100644 index 44e6ce7d5e..0000000000 --- a/ext/xml/expat/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -CC=gcc -# If you know what your system's byte order is, define XML_BYTE_ORDER: -# use -DXML_BYTE_ORDER=12 for little-endian byte order; -# use -DXML_BYTE_ORDER=21 for big-endian (network) byte order. -# -DXML_NS adds support for checking of lexical aspects of XML namespaces spec -# -DXML_MIN_SIZE makes a smaller but slower parser -CFLAGS=-O2 -Ixmltok -Ixmlparse -DXML_NS -# Use one of the next two lines; unixfilemap is better if it works. -FILEMAP_OBJ=xmlwf/unixfilemap.o -#FILEMAP_OBJ=xmlwf/readfilemap.o -OBJS=xmltok/xmltok.o \ - xmltok/xmlrole.o \ - xmlwf/xmlwf.o \ - xmlwf/xmlfile.o \ - xmlwf/codepage.o \ - xmlparse/xmlparse.o \ - xmlparse/hashtable.o \ - $(FILEMAP_OBJ) -EXE= - -all: xmlwf/xmlwf$(EXE) - -xmlwf/xmlwf$(EXE): $(OBJS) - $(CC) $(CFLAGS) -o $@ $(OBJS) - -clean: - rm -f $(OBJS) xmlwf/xmlwf$(EXE) - -xmltok/nametab.h: gennmtab/gennmtab$(EXE) - rm -f $@ - gennmtab/gennmtab$(EXE) >$@ - -gennmtab/gennmtab$(EXE): gennmtab/gennmtab.c - $(CC) $(CFLAGS) -o $@ gennmtab/gennmtab.c - -xmltok/xmltok.o: xmltok/nametab.h - -.c.o: - $(CC) $(CFLAGS) -c -o $@ $< diff --git a/ext/xml/expat/Makefile.in b/ext/xml/expat/Makefile.in new file mode 100644 index 0000000000..f983b1d8f0 --- /dev/null +++ b/ext/xml/expat/Makefile.in @@ -0,0 +1,13 @@ + +DEPTH = ../../.. +topsrcdir = @topsrcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +LTLIBRARY_NAME = libexpat.la +LTLIBRARY_DEPENDENCIES = xmltok/libexpat_tok.la xmlparse/libexpat_parse.la +LTLIBRARY_LIBADD = $(LTLIBRARY_DEPENDENCIES) + +SUBDIRS = xmltok xmlparse + +include $(topsrcdir)/build/ltlib.mk diff --git a/ext/xml/expat/xmlparse/Makefile.in b/ext/xml/expat/xmlparse/Makefile.in new file mode 100644 index 0000000000..9e405bbe03 --- /dev/null +++ b/ext/xml/expat/xmlparse/Makefile.in @@ -0,0 +1,12 @@ + +DEPTH = ../../../.. +topsrcdir = @topsrcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +LTLIBRARY_NAME = libexpat_parse.la +LTLIBRARY_SOURCES = xmlparse.c hashtable.c + +EXTRA_INCLUDES = -I$(srcdir)/../xmltok + +include $(topsrcdir)/build/ltlib.mk diff --git a/ext/xml/expat/xmltok/Makefile.in b/ext/xml/expat/xmltok/Makefile.in new file mode 100644 index 0000000000..5e88c5d2b6 --- /dev/null +++ b/ext/xml/expat/xmltok/Makefile.in @@ -0,0 +1,10 @@ + +DEPTH = ../../../.. +topsrcdir = @topsrcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +LTLIBRARY_NAME = libexpat_tok.la +LTLIBRARY_SOURCES = xmltok.c xmlrole.c + +include $(topsrcdir)/build/ltlib.mk |