- config.h.in configure.in libxslt/xsltconfig.h.in: added

  ansidecl.h test
- libxslt/xsltproc.c : added --xinclude option
- tests/XSLTMark/union.out : fixed the output
Daniel

ChangeLog

+Wed Apr 11 14:25:23 CEST 2001 Daniel Veillard <Daniel.Veillard@imag.fr>
+
+	* config.h.in configure.in libxslt/xsltconfig.h.in: added
+	  ansidecl.h test
+	* libxslt/xsltproc.c : added --xinclude option
+	* tests/XSLTMark/union.out : fixed the output
+
 Tue Apr 10 20:05:00 CEST 2001 Fatih Demir <kabalak@gtranslator.org>
 
 	* .cvsignore & doc/.cvsignore: Added CVS ignore files.

config.h.in

@@ -12,6 +12,9 @@
 #undef HAVE_FLOOR
 #undef HAVE_FABS
 
+/* Define if you have the <ansidecl.h> header file.  */
+#undef HAVE_ANSIDECL_H
+
 /* Define if you have the <float.h> header file.  */
 #undef HAVE_FLOAT_H
 

configure.in

@@ -21,7 +21,7 @@
 dnl Math detection
 dnl
 
-AC_CHECK_HEADERS(ieeefp.h nan.h math.h fp_class.h float.h)
+AC_CHECK_HEADERS(ieeefp.h nan.h math.h fp_class.h float.h ansidecl.h)
 AC_CHECK_FUNC(isnan, , AC_CHECK_LIB(m, isnan,
   [M_LIBS="-lm"; AC_DEFINE(HAVE_ISNAN)]))
 

libxslt/xsltconfig.h.in

@@ -21,4 +21,5 @@
 #endif
 
 #ifdef __GNUC__
+#ifdef HAVE_ANSIDECL_H
 #include <ansidecl.h>
@@ -24,4 +25,5 @@
 #include <ansidecl.h>
+#endif
 #ifndef ATTRIBUTE_UNUSED
 #define ATTRIBUTE_UNUSED
 #endif

libxslt/xsltproc.c

@@ -13,6 +13,9 @@
 #include <libxml/xmlmemory.h>
 #include <libxml/debugXML.h>
 #include <libxml/HTMLtree.h>
+#ifdef LIBXML_XINCLUDE_ENABLED
+#include <libxml/xinclude.h>
+#endif
 #include <libxslt/xslt.h>
 #include <libxslt/xsltInternals.h>
 #include <libxslt/transform.h>
@@ -25,6 +28,9 @@
 static int timing = 0;
 static int novalid = 0;
 static int noout = 0;
+#ifdef LIBXML_XINCLUDE_ENABLED
+static int xinclude = 0;
+#endif
 
 int
 main(int argc, char **argv) {
@@ -72,6 +78,11 @@
 	} else if ((!strcmp(argv[i], "-timing")) ||
 		   (!strcmp(argv[i], "--timing"))) {
 	    timing++;
+#ifdef LIBXML_XINCLUDE_ENABLED
+	} else if ((!strcmp(argv[i], "-xinclude")) ||
+		   (!strcmp(argv[i], "--xinclude"))) {
+	    xinclude++;
+#endif
 	} else if ((!strcmp(argv[i], "-param")) ||
 		   (!strcmp(argv[i], "--param"))) {
 	    i++;
@@ -150,6 +161,22 @@
 		fprintf(stderr, "Parsing document %s took %ld ms\n",
 			argv[i], msec);
 	    }
+#ifdef LIBXML_XINCLUDE_ENABLED
+	    if (xinclude) {
+		if (timing)
+		    gettimeofday(&begin, NULL);
+		xmlXIncludeProcess(doc);
+		if (timing) {
+		    long msec;
+		    gettimeofday(&end, NULL);
+		    msec = end.tv_sec - begin.tv_sec;
+		    msec *= 1000;
+		    msec += (end.tv_usec - begin.tv_usec) / 1000;
+		    fprintf(stderr, "XInclude processing %s took %ld ms\n",
+			    argv[i], msec);
+		}
+	    }
+#endif
 	    if (timing)
 		gettimeofday(&begin, NULL);
 	    if (repeat) {

tests/XSLTMark/union.out

@@ -3,7 +3,6 @@
 <B>x2xxxb</B>
 <A>a3xxxx</A>
 <B>a5xxxb</B>
-<B>a5xxxb</B>
 <B>x7xxxb</B>
 <A>a8xxxx</A>
 </TOP>