preparing 1.0.14 updated rebuilt implemented the IN_LIBXSLT and

* configure.in: preparing 1.0.14
* doc/*: updated rebuilt
* libxslt/*.c libexslt/*.c libxslt/libxslt.h libexslt/libexslt.h:
  implemented the IN_LIBXSLT and IN_LIBEXSLT mechanism discussed
  with the Windows maintainers
Daniel

diff --git a/ChangeLog b/ChangeLog
index 1db7cfb..bb78002 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Mon Mar 18 20:45:27 CET 2002 Daniel Veillard <daniel@veillard.com>
+
+       * configure.in: preparing 1.0.14
+       * doc/*: updated rebuilt
+       * libxslt/*.c libexslt/*.c libxslt/libxslt.h libexslt/libexslt.h:
+         implemented the IN_LIBXSLT and IN_LIBEXSLT mechanism discussed
+         with the Windows maintainers
+
 Mon Mar 18 16:22:46 CET 2002 Daniel Veillard <daniel@veillard.com>
 
        * python/Makefile.am python/generator.py python/libxslt.c

diff --git a/configure.in b/configure.in
index 53a59b6..838527f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -6,7 +6,7 @@ dnl libexslt is an extension
 dnl
 LIBXSLT_MAJOR_VERSION=1
 LIBXSLT_MINOR_VERSION=0
-LIBXSLT_MICRO_VERSION=13
+LIBXSLT_MICRO_VERSION=14
 PACKAGE=libxslt
 LIBEXSLT_MAJOR_VERSION=0
 LIBEXSLT_MINOR_VERSION=7

diff --git a/doc/news.html b/doc/news.html
index 987dac8..10dfb43 100644 (file)
--- a/doc/news.html
+++ b/doc/news.html
@@ -76,6 +76,13 @@ A:link, A:visited, A:active { text-decoration: underline }
 <td valign="top" bgcolor="#8b7765"><table border="0" cellspacing="0" cellpadding="1" width="100%"><tr><td><table border="0" cellspacing="0" cellpadding="1" width="100%" bgcolor="#000000"><tr><td><table border="0" cellpadding="3" cellspacing="1" width="100%"><tr><td bgcolor="#fffacd">
 <h3>CVS only : check the <a href="http://cvs.gnome.org/lxr/source/libxslt/ChangeLog">Changelog</a> file
 for a really accurate description</h3>
+<h3>1.0.14: Mar 18 2002</h3>
+<ul>
+<li>Improvement in the XPath engine (libxml2-2.4.18)</li>
+<li>Nasty bug fix related to exslt:node-set</li>
+<li>Fixed the python Makefiles, cleanup of doc comments, Windows
+    portability fixes</li>
+</ul>
 <h3>1.0.13: Mar 8 2002</h3>
 <ul>
 <li>a number of bug fixes including &quot;namespace node have no parents&quot;</li>

diff --git a/doc/xslt.html b/doc/xslt.html
index 8f4284a..24d2c81 100644 (file)
--- a/doc/xslt.html
+++ b/doc/xslt.html
@@ -232,6 +232,14 @@ platform, get in touch with me to upload the package. I will keep them in the
 href="http://cvs.gnome.org/lxr/source/libxslt/ChangeLog">Changelog</a> file
 for a really accurate description</h3>
 
+<h3>1.0.14: Mar 18 2002</h3>
+<ul>
+  <li>Improvement in the XPath engine (libxml2-2.4.18)</li>
+  <li>Nasty bug fix related to exslt:node-set</li>
+  <li>Fixed the python Makefiles, cleanup of doc comments, Windows
+    portability fixes</li>
+</ul>
+
 <h3>1.0.13: Mar 8 2002</h3>
 <ul>
   <li>a number of bug fixes including "namespace node have no parents"</li>

diff --git a/libexslt/common.c b/libexslt/common.c
index e759a28..1fd5985 100644 (file)
--- a/libexslt/common.c
+++ b/libexslt/common.c
@@ -1,3 +1,4 @@
+#define IN_LIBEXSLT
 #include "libexslt/libexslt.h"
 
 #if defined(WIN32) && !defined (__CYGWIN__)

diff --git a/libexslt/date.c b/libexslt/date.c
index 15ba3ba..b32b091 100644 (file)
--- a/libexslt/date.c
+++ b/libexslt/date.c
@@ -15,6 +15,7 @@
  * implement "other" date/time extension functions
  */
 
+#define IN_LIBEXSLT
 #include "libexslt/libexslt.h"
 
 #include <stdlib.h>

diff --git a/libexslt/exslt.c b/libexslt/exslt.c
index ebba86f..9544cb3 100644 (file)
--- a/libexslt/exslt.c
+++ b/libexslt/exslt.c
@@ -1,3 +1,4 @@
+#define IN_LIBEXSLT
 #include "libexslt/libexslt.h"
 
 #include <libxml/xmlversion.h>

diff --git a/libexslt/functions.c b/libexslt/functions.c
index 9f92914..f9fc7d2 100644 (file)
--- a/libexslt/functions.c
+++ b/libexslt/functions.c
@@ -1,3 +1,4 @@
+#define IN_LIBEXSLT
 #include "libexslt/libexslt.h"
 
 #if defined(WIN32) && !defined (__CYGWIN__)

diff --git a/libexslt/libexslt.h b/libexslt/libexslt.h
index 0aa2715..9a65d9e 100644 (file)
--- a/libexslt/libexslt.h
+++ b/libexslt/libexslt.h
@@ -9,8 +9,6 @@
 #ifndef __XSLT_LIBEXSLT_H__
 #define __XSLT_LIBEXSLT_H__
 
-#define IN_LIBEXSLT
-
 #if defined(WIN32) && !defined (__CYGWIN__)
 #include <win32config.h>
 #else

diff --git a/libexslt/math.c b/libexslt/math.c
index 3a307bc..9aedd6b 100644 (file)
--- a/libexslt/math.c
+++ b/libexslt/math.c
@@ -1,3 +1,4 @@
+#define IN_LIBEXSLT
 #include "libexslt/libexslt.h"
 
 #if defined(WIN32) && !defined (__CYGWIN__)
@@ -15,11 +16,11 @@
 #include <libxslt/xsltInternals.h>
 #include <libxslt/extensions.h>
 
-#if HAVE_MATH_H
+#ifdef HAVE_MATH_H
 #include <math.h>
 #endif
 
-#if HAVE_STDLIB_H
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
 #endif
 
@@ -1043,7 +1044,7 @@ exsltMathRegister (void) {
     xsltRegisterExtModuleFunction ((const xmlChar *) "constant",
                                   EXSLT_MATH_NAMESPACE,
                                   exsltMathConstantFunction);
-#if HAVE_STDLIB_H
+#ifdef HAVE_STDLIB_H
     xsltRegisterExtModuleFunction ((const xmlChar *) "random",
                                   EXSLT_MATH_NAMESPACE,
                                   exsltMathRandomFunction);

diff --git a/libexslt/saxon.c b/libexslt/saxon.c
index c801601..30ec514 100644 (file)
--- a/libexslt/saxon.c
+++ b/libexslt/saxon.c
@@ -1,3 +1,4 @@
+#define IN_LIBEXSLT
 #include "libexslt/libexslt.h"
 
 #if defined(WIN32) && !defined (__CYGWIN__)

diff --git a/libexslt/sets.c b/libexslt/sets.c
index b62a39d..dfc807b 100644 (file)
--- a/libexslt/sets.c
+++ b/libexslt/sets.c
@@ -1,3 +1,4 @@
+#define IN_LIBEXSLT
 #include "libexslt/libexslt.h"
 
 #if defined(WIN32) && !defined (__CYGWIN__)

diff --git a/libexslt/strings.c b/libexslt/strings.c
index 4092663..908f877 100644 (file)
--- a/libexslt/strings.c
+++ b/libexslt/strings.c
@@ -1,3 +1,4 @@
+#define IN_LIBEXSLT
 #include "libexslt/libexslt.h"
 
 #if defined(WIN32) && !defined (__CYGWIN__)

diff --git a/libxslt/attributes.c b/libxslt/attributes.c
index a103d1e..d19e848 100644 (file)
--- a/libxslt/attributes.c
+++ b/libxslt/attributes.c
@@ -9,6 +9,7 @@
  * daniel@veillard.com
  */
 
+#define IN_LIBXSLT
 #include "libxslt.h"
 
 #include <string.h>

diff --git a/libxslt/documents.c b/libxslt/documents.c
index 86771af..1eb46c8 100644 (file)
--- a/libxslt/documents.c
+++ b/libxslt/documents.c
@@ -6,6 +6,7 @@
  * daniel@veillard.com
  */
 
+#define IN_LIBXSLT
 #include "libxslt.h"
 
 #include <string.h>

diff --git a/libxslt/extensions.c b/libxslt/extensions.c
index ba127cf..cfd9d76 100644 (file)
--- a/libxslt/extensions.c
+++ b/libxslt/extensions.c
@@ -9,6 +9,7 @@
  * daniel@veillard.com
  */
 
+#define IN_LIBXSLT
 #include "libxslt.h"
 
 #include <string.h>

diff --git a/libxslt/extra.c b/libxslt/extra.c
index eae261d..de5964e 100644 (file)
--- a/libxslt/extra.c
+++ b/libxslt/extra.c
@@ -10,6 +10,7 @@
  * daniel@veillard.com
  */
 
+#define IN_LIBXSLT
 #include "libxslt.h"
 
 #include <string.h>

diff --git a/libxslt/functions.c b/libxslt/functions.c
index 1a00105..f155f50 100644 (file)
--- a/libxslt/functions.c
+++ b/libxslt/functions.c
@@ -10,6 +10,7 @@
  * Bjorn Reese <breese@users.sourceforge.net> for number formatting
  */
 
+#define IN_LIBXSLT
 #include "libxslt.h"
 
 #include <string.h>

diff --git a/libxslt/imports.c b/libxslt/imports.c
index 40827b2..6473b84 100644 (file)
--- a/libxslt/imports.c
+++ b/libxslt/imports.c
@@ -9,6 +9,7 @@
  * daniel@veillard.com
  */
 
+#define IN_LIBXSLT
 #include "libxslt.h"
 
 #include <string.h>

diff --git a/libxslt/keys.c b/libxslt/keys.c
index 47d31dd..6f830f6 100644 (file)
--- a/libxslt/keys.c
+++ b/libxslt/keys.c
@@ -9,6 +9,7 @@
  * daniel@veillard.com
  */
 
+#define IN_LIBXSLT
 #include "libxslt.h"
 
 #include <string.h>

diff --git a/libxslt/libxslt.h b/libxslt/libxslt.h
index 0a51abc..f3f5743 100644 (file)
--- a/libxslt/libxslt.h
+++ b/libxslt/libxslt.h
@@ -9,8 +9,6 @@
 #ifndef __XSLT_LIBXSLT_H__
 #define __XSLT_LIBXSLT_H__
 
-#define IN_LIBXSLT
-
 #if defined(WIN32) && !defined (__CYGWIN__)
 #include <win32config.h>
 #else

diff --git a/libxslt/namespaces.c b/libxslt/namespaces.c
index ee35b93..801c784 100644 (file)
--- a/libxslt/namespaces.c
+++ b/libxslt/namespaces.c
@@ -9,6 +9,7 @@
  * daniel@veillard.com
  */
 
+#define IN_LIBXSLT
 #include "libxslt.h"
 
 #include <string.h>

diff --git a/libxslt/numbers.c b/libxslt/numbers.c
index 6a17eb0..51d22c3 100644 (file)
--- a/libxslt/numbers.c
+++ b/libxslt/numbers.c
@@ -10,6 +10,7 @@
  * Bjorn Reese <breese@users.sourceforge.net>
  */
 
+#define IN_LIBXSLT
 #include "libxslt.h"
 
 #include <math.h>

diff --git a/libxslt/pattern.c b/libxslt/pattern.c
index 1f45de5..177eae1 100644 (file)
--- a/libxslt/pattern.c
+++ b/libxslt/pattern.c
@@ -14,6 +14,7 @@
  * TODO: detect [number] at compilation, optimize accordingly
  */
 
+#define IN_LIBXSLT
 #include "libxslt.h"
 
 #include <string.h>

diff --git a/libxslt/preproc.c b/libxslt/preproc.c
index 52f22a7..6842e32 100644 (file)
--- a/libxslt/preproc.c
+++ b/libxslt/preproc.c
@@ -15,6 +15,7 @@
  * daniel@veillard.com
  */
 
+#define IN_LIBXSLT
 #include "libxslt.h"
 
 #include <string.h>

diff --git a/libxslt/templates.c b/libxslt/templates.c
index 064394e..221f694 100644 (file)
--- a/libxslt/templates.c
+++ b/libxslt/templates.c
@@ -9,6 +9,7 @@
  * daniel@veillard.com
  */
 
+#define IN_LIBXSLT
 #include "libxslt.h"
 
 #include <string.h>

diff --git a/libxslt/transform.c b/libxslt/transform.c
index 10d3b9c..7685127 100644 (file)
--- a/libxslt/transform.c
+++ b/libxslt/transform.c
@@ -16,6 +16,7 @@
  * daniel@veillard.com
  */
 
+#define IN_LIBXSLT
 #include "libxslt.h"
 
 #include <string.h>

diff --git a/libxslt/variables.c b/libxslt/variables.c
index 9c42687..e81e5fc 100644 (file)
--- a/libxslt/variables.c
+++ b/libxslt/variables.c
@@ -9,6 +9,7 @@
  * daniel@veillard.com
  */
 
+#define IN_LIBXSLT
 #include "libxslt.h"
 
 #include <string.h>

diff --git a/libxslt/xslt.c b/libxslt/xslt.c
index 3b87ae5..e053c4c 100644 (file)
--- a/libxslt/xslt.c
+++ b/libxslt/xslt.c
@@ -13,6 +13,7 @@
  * daniel@veillard.com
  */
 
+#define IN_LIBXSLT
 #include "libxslt.h"
 
 #include <string.h>

diff --git a/libxslt/xsltutils.c b/libxslt/xsltutils.c
index ca62e63..a35a241 100644 (file)
--- a/libxslt/xsltutils.c
+++ b/libxslt/xsltutils.c
@@ -9,6 +9,7 @@
  * daniel@veillard.com
  */
 
+#define IN_LIBXSLT
 #include "libxslt.h"
 
 #include <stdio.h>

diff --git a/libxslt/xsltwin32config.h b/libxslt/xsltwin32config.h
index 2f16aa7..3020992 100644 (file)
--- a/libxslt/xsltwin32config.h
+++ b/libxslt/xsltwin32config.h
@@ -21,21 +21,21 @@ extern "C" {
  *
  * the version string like "1.2.3"
  */
-#define LIBXSLT_DOTTED_VERSION "1.0.13"
+#define LIBXSLT_DOTTED_VERSION "1.0.14"
 
 /**
  * LIBXSLT_VERSION:
  *
  * the version number: 1.2.3 value is 1002003
  */
-#define LIBXSLT_VERSION 10013
+#define LIBXSLT_VERSION 10014
 
 /**
  * LIBXSLT_VERSION_STRING:
  *
  * the version number string, 1.2.3 value is "1002003"
  */
-#define LIBXSLT_VERSION_STRING "10013"
+#define LIBXSLT_VERSION_STRING "10014"
 
 /**
  * WITH_XSLT_DEBUG: