From 7150a0385cbe74e20734620ab7bddf2c10843836 Mon Sep 17 00:00:00 2001
From: Daniel Veillard <veillard@src.gnome.org>
Date: Wed, 2 May 2001 16:41:11 +0000
Subject: [PATCH] - configure.in Makefile.am: make the inclusion of the trio  
 modules in the library conditional Daniel

---
 ChangeLog    |  5 +++++
 Makefile.am  | 15 ++++++++++++---
 configure.in |  1 +
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 232eb12b..90b0b16f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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