fixed a bug in merging public info from C modules. patch from Mark Vakoc

* doc/apibuild.py: fixed a bug in merging public info from
  C modules.
* win32/Makefile.msvc win32/configure.js: patch from Mark Vakoc
  the iconv option to configure.js didn't work, and
  added zlib option needed when linking xsltproc statically
Daniel

diff --git a/ChangeLog b/ChangeLog
index 0988184..927aca3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Thu Dec 12 01:17:09 CET 2002 Daniel Veillard <daniel@veillard.com>
+
+       * doc/apibuild.py: fixed a bug in merging public info from
+         C modules.
+       * win32/Makefile.msvc win32/configure.js: patch from Mark Vakoc
+         the iconv option to configure.js didn't work, and 
+         added zlib option needed when linking xsltproc statically
+
 Wed Dec 11 19:18:45 CET 2002 Daniel Veillard <daniel@veillard.com>
 
        * doc/Makefile.am doc/apibuild.py doc/libexslt-api.xml: added

diff --git a/doc/apibuild.py b/doc/apibuild.py
index 2814877..97380c1 100755 (executable)
--- a/doc/apibuild.py
+++ b/doc/apibuild.py
@@ -182,9 +182,6 @@ class index:
              if self.functions.has_key(id):
                  up = idx.functions[id]
                  self.functions[id].update(None, up.type, up.info, up.extra)
-             else:
-                 if idx.functions[id].static == 0:
-                     self.functions[id] = idx.functions[id]
 
      def analyze_dict(self, type, dict):
          count = 0

diff --git a/win32/Makefile.msvc b/win32/Makefile.msvc
index 39d9629..8cb75a3 100644 (file)
--- a/win32/Makefile.msvc
+++ b/win32/Makefile.msvc
@@ -304,6 +304,9 @@ APPLIBS = $(LIBS) libxml2_a.lib
 !if "$(WITH_ICONV)" == "1"
 APPLIBS = $(APPLIBS) iconv.lib
 !endif
+!if "$(WITH_ZLIB)" == "1"
+APPLIBS = $(APPLIBS) zlib.lib
+!endif
 {$(UTILS_SRCDIR)}.c{$(BINDIR)}.exe:
        $(CC) /D "LIBXML_STATIC" /D "LIBXSLT_STATIC" /D "LIBEXSLT_STATIC" \
                $(CFLAGS) /Fo$(UTILS_INTDIR)\ /c $< 

diff --git a/win32/configure.js b/win32/configure.js
index 4446d38..8325f5a 100644 (file)
--- a/win32/configure.js
+++ b/win32/configure.js
@@ -44,6 +44,7 @@ var withXsltDebug = true;
 var withMemDebug = false;
 var withDebugger = true;
 var withIconv = true;
+var withZlib = false;
 /* Win32 build options. */
 var compiler = "msvc";
 var buildDebug = 0;
@@ -97,6 +98,7 @@ function usage()
        txt += "  mem_debug:  Enable memory debugger (" + (withMemDebug? "yes" : "no")  + ")\n";
        txt += "  debugger:   Enable external debugger support (" + (withDebugger? "yes" : "no")  + ")\n";
        txt += "  iconv:      Use iconv library (" + (withIconv? "yes" : "no")  + ")\n";
+       txt += "  zlib:       Use zlib library (" + (withZlib? "yes" : "no") + ")\n";
        txt += "\nWin32 build options, default value given in parentheses:\n\n";
        txt += "  compiler:   Compiler to be used [msvc|mingw] (" + compiler + ")\n";
        txt += "  debug:      Build unoptimised debug executables (" + (buildDebug? "yes" : "no")  + ")\n";
@@ -167,6 +169,7 @@ function discoverVersion()
        vf.WriteLine("WITH_MEM_DEBUG=" + (withMemDebug? "1" : "0"));
        vf.WriteLine("WITH_DEBUGGER=" + (withDebugger? "1" : "0"));
        vf.WriteLine("WITH_ICONV=" + (withIconv? "1" : "0"));
+       vf.WriteLine("WITH_ZLIB=" + (withZlib? "1" : "0"));
        vf.WriteLine("DEBUG=" + (buildDebug? "1" : "0"));
        vf.WriteLine("STATIC=" + (buildStatic? "1" : "0"));
        vf.WriteLine("PREFIX=" + buildPrefix);
@@ -317,7 +320,9 @@ for (i = 0; (i < WScript.Arguments.length) && (error == 0); i++) {
                else if (opt == "debug")
                        buildDebug = strToBool(arg.substring(opt.length + 1, arg.length));
                else if (opt == "iconv")
-                       buildIconv = strToBool(arg.substring(opt.length + 1, arg.length));
+                       withIconv = strToBool(arg.substring(opt.length + 1, arg.length));
+               else if (opt == "zlib")
+                       withZlib  = strToBool(arg.substring(opt.length + 1, arg.length));
                else if (opt == "compiler")
                        compiler = arg.substring(opt.length + 1, arg.length);
                else if (opt == "static")
@@ -398,6 +403,7 @@ txtOut += "  Debugging module: " + boolToStr(withXsltDebug) + "\n";
 txtOut += "  Memory debugging: " + boolToStr(withMemDebug) + "\n";
 txtOut += "  Debugger support: " + boolToStr(withDebugger) + "\n";
 txtOut += "         Use iconv: " + boolToStr(withIconv) + "\n";
+txtOut += "         With zlib: " + boolToStr(withZlib) + "\n";
 txtOut += "\n";
 txtOut += "Win32 build configuration\n";
 txtOut += "-------------------------\n";