diff options
| author | Daniel Veillard <veillard@src.gnome.org> | 2001-05-02 16:41:11 +0000 |
|---|---|---|
| committer | Daniel Veillard <veillard@src.gnome.org> | 2001-05-02 16:41:11 +0000 |
| commit | 7150a0385cbe74e20734620ab7bddf2c10843836 (patch) | |
| tree | 6cb71cd0a4abe5725fb28667ddd594e3ea7a56e0 | |
| parent | c057c5dcd1e44a091cc031147462012a27fc35f1 (diff) | |
| download | libxml2-7150a0385cbe74e20734620ab7bddf2c10843836.tar.gz | |
- configure.in Makefile.am: make the inclusion of the trio
modules in the library conditional
Daniel
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Makefile.am | 15 | ||||
| -rw-r--r-- | configure.in | 1 |
3 files changed, 18 insertions, 3 deletions
@@ -1,3 +1,8 @@ +Wed May 2 18:39:39 CEST 2001 Daniel Veillard <Daniel.Veillard@imag.fr> + + * configure.in Makefile.am: make the inclusion of the trio + modules in the library conditional + Wed May 2 14:39:57 CEST 2001 Daniel Veillard <Daniel.Veillard@imag.fr> * DOCBparser.c: patche from László Kovács, fixed entities refs diff --git a/Makefile.am b/Makefile.am index d66fe22e..21c1d9fd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -15,11 +15,20 @@ libxml2_la_LIBADD = @Z_LIBS@ -lm libxml2_la_LDFLAGS = -version-info @LIBXML_VERSION_INFO@ +if WITH_TRIO_SOURCES libxml2_la_SOURCES = SAX.c entities.c encoding.c error.c parserInternals.c \ parser.c tree.c hash.c list.c xmlIO.c xmlmemory.c uri.c \ valid.c xlink.c HTMLparser.c HTMLtree.c debugXML.c xpath.c \ xpointer.c xinclude.c nanohttp.c nanoftp.c DOCBparser.c \ - strio.c strio.h trio.c trio.h triop.h libxml.h + strio.c trio.c + +else +libxml2_la_SOURCES = SAX.c entities.c encoding.c error.c parserInternals.c \ + parser.c tree.c hash.c list.c xmlIO.c xmlmemory.c uri.c \ + valid.c xlink.c HTMLparser.c HTMLtree.c debugXML.c xpath.c \ + xpointer.c xinclude.c nanohttp.c nanoftp.c DOCBparser.c + +endif DEPS = $(top_builddir)/libxml2.la LDADDS = $(top_builddir)/libxml2.la @Z_LIBS@ -lm @@ -435,8 +444,8 @@ EXTRA_DIST = xml2Conf.sh.in libxml.spec.in libxml.spec libxml.m4 \ win32/libxml2/libxml2.dsp win32/libxml2/libxml2_so.dsp \ win32/libxml2/libxml2_a.dsp win32/libxml2/xmllint.dsp \ win32/libxml2/libxml2.def.src \ - vms/build_libxml.com vms/config.vms \ - trio.h strio.h + vms/build_libxml.com vms/config.vms + strio.c strio.h trio.c trio.h triop.h libxml.h pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libxml-2.0.pc diff --git a/configure.in b/configure.in index e196c1df..416a3ec5 100644 --- a/configure.in +++ b/configure.in @@ -259,6 +259,7 @@ if test "${NEED_TRIO}" = "1" ; then else WITH_TRIO=0 fi +AM_CONDITIONAL(WITH_TRIO_SOURCES, "${NEED_TRIO}" = "1") AC_SUBST(WITH_TRIO) dnl |