diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | configure.in | 3 | ||||
| -rw-r--r-- | libexslt/Makefile.am | 2 | ||||
| -rw-r--r-- | libxslt/transform.c | 2 |
4 files changed, 11 insertions, 2 deletions
@@ -1,3 +1,9 @@ +Wed Nov 21 16:29:04 CET 2001 Daniel Veillard <daniel@veillard.com> + + * configure.in libexslt/Makefile.am: trying to fix more Makefiles + crapola + * libxslt/transform.c: small fix. + Tue Nov 13 16:16:41 CET 2001 Daniel Veillard <daniel@veillard.com> * vms/* Makefile.am: included OpenVMS port instructions from diff --git a/configure.in b/configure.in index ac62ac1b..a5518b67 100644 --- a/configure.in +++ b/configure.in @@ -264,11 +264,12 @@ case ${host} in esac XSLT_INCLUDEDIR='-I${includedir}' -EXTRA_LIBS="$M_LIBS" if test "${WITH_DEBUGGER}" = "1" ; then XSLT_LIBS="-lxslt -lxsltbreakpoint $LIBXML_LIBS $M_LIBS" + EXTRA_LIBS="-lxsltbreakpoint -lxml2 $M_LIBS" else XSLT_LIBS="-lxslt $LIBXML_LIBS $M_LIBS" + EXTRA_LIBS="-lxml2 $M_LIBS" fi diff --git a/libexslt/Makefile.am b/libexslt/Makefile.am index c50fa89b..224b0835 100644 --- a/libexslt/Makefile.am +++ b/libexslt/Makefile.am @@ -22,7 +22,7 @@ libexslt_la_SOURCES = \ date.c \ saxon.c -libexslt_la_LIBADD = $(EXTRA_LIBS) +libexslt_la_LIBADD = -lxslt $(EXTRA_LIBS) libexslt_la_LDFLAGS = -version-info @LIBEXSLT_VERSION_INFO@ man_MANS = libexslt.4 diff --git a/libxslt/transform.c b/libxslt/transform.c index 6d6122d2..a18cf33c 100644 --- a/libxslt/transform.c +++ b/libxslt/transform.c @@ -517,6 +517,8 @@ xsltCopyNode(xsltTransformContextPtr ctxt, xmlNodePtr node, xmlNodePtr insert) { xmlNodePtr copy; + if (node->type == XML_DTD_NODE) + return(NULL); if ((node->type == XML_TEXT_NODE) || (node->type == XML_CDATA_SECTION_NODE)) return(xsltCopyText(ctxt, insert, node)); |