Index: Makefile.in
===================================================================
RCS file: /cvsroot/tclxml/tclxslt/Makefile.in,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 Makefile.in
--- Makefile.in	3 Dec 2003 20:20:31 -0000	1.9
+++ Makefile.in	3 Jun 2005 23:14:49 -0000
@@ -56,8 +56,8 @@ Tclxsltstub_LIB_FILE	= @Tclxsltstub_LIB_
 tclxml_libxml2_STUB_LIB_FILE	= @tclxml_libxml2_STUB_LIB_FILE@
 tclxml_libxml2_VERSION	= @tclxml_libxml2_VERSION@
 
-tcldomxml_STUB_LIB_FILE	= @tcldomxml_STUB_LIB_FILE@
-Tcldomxml_VERSION	= @tcldomxml_VERSION@
+tcldom_libxml2_STUB_LIB_FILE	= @tcldom_libxml2_STUB_LIB_FILE@
+tcldom_libxml2_VERSION	= @tcldom_libxml2_VERSION@
 
 #========================================================================
 # RUNTIME_SOURCES identifies Tcl runtime files that are associated with
@@ -84,13 +84,19 @@ LIBXSLT_LIBDIR          =       @LIBXSLT
 LIBEXSLT_INCLUDEDIR     =       @LIBEXSLT_INCLUDEDIR@
 LIBEXSLT_LIBDIR         =       @LIBEXSLT_LIBDIR@
 
+TCLXML_LIBXML2_INCLUDEDIR =	@TCLXML_LIBXML2_INCLUDEDIR@
+TCLDOM_LIBXML2_INCLUDEDIR =	@TCLDOM_LIBXML2_INCLUDEDIR@
+
 #========================================================================
 # This is a list of script files to be installed
 #========================================================================
 
 GENERIC_SCRIPTS	=			\
 	$(srcdir)/library/tclxslt.tcl	\
-	$(srcdir)/library/xsltcache.tcl
+	$(srcdir)/library/xsltcache.tcl	\
+	$(srcdir)/library/resources.tcl	\
+	$(srcdir)/library/process.tcl	\
+	$(srcdir)/library/utilities.tcl
 
 #========================================================================
 # Add additional lines to handle any additional AC_SUBST cases that
@@ -193,7 +199,9 @@ INCLUDES	= @TCL_INCLUDES@ 	\
 	-I$(LIBXML2_INCLUDEDIR)		\
 	-I$(LIBXSLT_INCLUDEDIR)		\
 	-I$(LIBEXSLT_INCLUDEDIR)	\
-	-I$(srcdir)/include
+	-I$(srcdir)/include		\
+	-I$(TCLXML_LIBXML2_INCLUDEDIR)	\
+	-I$(TCLDOM_LIBXML2_INCLUDEDIR)	
 
 EXTRA_CFLAGS	= $(MEM_DEBUG_FLAGS) @EXTRA_CFLAGS@
 
@@ -203,7 +211,7 @@ CONFIG_CLEAN_FILES = Makefile
 
 CPPFLAGS	= @CPPFLAGS@ \
 	-DTCLXML_LIBXML2_VERSION=\"$(tclxml_libxml2_VERSION)\" \
-	-DTCLDOMXML_VERSION=\"$(Tcldomxml_VERSION)\"
+	-DTCLDOM_LIBXML2_VERSION=\"$(tcldom_libxml2_VERSION)\"
 LIBS		= @LIBS@
 AR		= ar
 CFLAGS		= @CFLAGS@
Index: configure.in
===================================================================
RCS file: /cvsroot/tclxml/tclxslt/configure.in,v
retrieving revision 1.19
diff -u -p -u -p -r1.19 configure.in
--- configure.in	20 May 2005 14:08:09 -0000	1.19
+++ configure.in	3 Jun 2005 23:14:49 -0000
@@ -90,10 +90,14 @@ TEA_SETUP_COMPILER
 TEA_PATH_CONFIG(tclxml_libxml2)
 TEA_LOAD_CONFIG(tclxml_libxml2)
 AC_SUBST(tclxml_libxml2_VERSION)
+TCLXML_LIBXML2_INCLUDEDIR=${tclxml_libxml2_SRC_DIR}/../include
+AC_SUBST(TCLXML_LIBXML2_INCLUDEDIR)
 
-TEA_PATH_CONFIG(tcldomlibxml2)
-TEA_LOAD_CONFIG(tcldomlibxml2)
+TEA_PATH_CONFIG(tcldom_libxml2)
+TEA_LOAD_CONFIG(tcldom_libxml2)
 AC_SUBST(tcldom_libxml2_VERSION)
+TCLDOM_LIBXML2_INCLUDEDIR=${tcldom_libxml2_SRC_DIR}/../include
+AC_SUBST(TCLDOM_LIBXML2_INCLUDEDIR)
 
 #--------------------------------------------------------------------
 # __CHANGE__
@@ -170,8 +174,8 @@ TEA_ENABLE_SYMBOLS
 
 AC_DEFINE(USE_TCL_STUBS)
 #AC_DEFINE(USE_TCLXML_STUBS)
-#AC_DEFINE(USE_TCLXML_LIBXML2_STUBS)
-#AC_DEFINE(USE_TCLDOM_LIBXML2_STUBS)
+AC_DEFINE(USE_TCLXML_LIBXML2_STUBS)
+AC_DEFINE(USE_TCLDOM_LIBXML2_STUBS)
 
 #--------------------------------------------------------------------
 # This macro generates a line to use when building a library.  It
Index: tclxslt.c
===================================================================
RCS file: /cvsroot/tclxml/tclxslt/tclxslt.c,v
retrieving revision 1.29
diff -u -p -u -p -r1.29 tclxslt.c
--- tclxslt.c	20 May 2005 14:08:09 -0000	1.29
+++ tclxslt.c	3 Jun 2005 23:14:50 -0000
@@ -250,14 +250,14 @@ Xslt_Init (interp)
   }
 #endif
 #ifdef USE_TCLXML_LIBXML2_STUBS
-  if (Tclxml_libxml2_InitStubs(interp, TCLXML_LIBXML2_VERSION, 1) == NULL) {
+  if (TclXML_libxml2_InitStubs(interp, TCLXML_LIBXML2_VERSION, 1) == NULL) {
     return TCL_ERROR;
   }
 #endif
-#ifdef USE_TCLDOMXML_STUBS
+#ifdef USE_TCLDOM_LIBXML2_STUBS
   /* This is  "dom::libxml2"
    */
-  if (Tcldomxml_InitStubs(interp, TCLDOMXML_VERSION, 1) == NULL) {
+  if (Tcldom_libxml2_InitStubs(interp, TCLDOM_LIBXML2_VERSION, 1) == NULL) {
     return TCL_ERROR;
   }
 #endif