[libxml2] Fix Win32 build * libxml.h win32/Makefile.bcb win32/Makefile.mingw win32/Makefile.msvc: add NOLIBT

[Rob Richards <rrichard src gnome org>]

commit a295fbc4cc7c7ff607d395198478d245fa68aead
Author: Rob Richards <rrichards cdatazone org>
Date:   Fri Mar 19 06:31:55 2010 -0400

    Fix Win32 build
    * libxml.h win32/Makefile.bcb win32/Makefile.mingw win32/Makefile.msvc: add
      NOLIBTOOL flag to prevent automatic define of LIBXML_STATIC

 libxml.h             |    2 +-
 win32/Makefile.bcb   |    4 ++--
 win32/Makefile.mingw |    4 ++--
 win32/Makefile.msvc  |    4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/libxml.h b/libxml.h
index 1656ac2..dfc6c64 100644
--- a/libxml.h
+++ b/libxml.h
@@ -90,7 +90,7 @@ void __xmlGlobalInitMutexDestroy(void);
 #endif
 #endif
 #endif
-#ifndef PIC
+#if !defined(PIC) && !defined(NOLIBTOOL)
 #  define LIBXML_STATIC
 #endif
 #endif /* ! __XML_LIBXML_H__ */
diff --git a/win32/Makefile.bcb b/win32/Makefile.bcb
index 0bc4dbb..d612e2d 100644
--- a/win32/Makefile.bcb
+++ b/win32/Makefile.bcb
@@ -43,14 +43,14 @@ UTILS_INTDIR = int.utils.bcb
 
 # The preprocessor and its options.
 CPP = cpp32.exe -P- -DWIN32
-CPPFLAGS = -I"$(XML_SRCDIR)\include"
+CPPFLAGS = -I"$(XML_SRCDIR)\include" -DNOLIBTOOL 
 !if "$(WITH_THREADS)" != "no"
 CPPFLAGS = $(CPPFLAGS) -D_REENTRANT -D__MT__
 !endif
 
 # The compiler and its options.
 CC = bcc32.exe
-CFLAGS = -q -DWIN32 -D_NO_VCL -D_WINDOWS -D_MBCS -DEILSEQ=2 -w-
+CFLAGS = -q -DWIN32 -D_NO_VCL -D_WINDOWS -D_MBCS -DEILSEQ=2 -DNOLIBTOOL -w-
 CFLAGS = $(CFLAGS) -I"$(XML_SRCDIR)" -I"$(XML_SRCDIR)\include" -I"$(INCPREFIX)" -I"$(INCLUDE)"
 !if "$(WITH_THREADS)" != "no"
 CFLAGS = $(CFLAGS) -D_REENTRANT -tWM
diff --git a/win32/Makefile.mingw b/win32/Makefile.mingw
index e79970e..a689f31 100644
--- a/win32/Makefile.mingw
+++ b/win32/Makefile.mingw
@@ -33,14 +33,14 @@ UTILS_INTDIR = int.utils.mingw
 
 # The preprocessor and its options.
 CPP = gcc.exe -E
-CPPFLAGS += -I$(XML_SRCDIR)/include
+CPPFLAGS += -I$(XML_SRCDIR)/include -DNOLIBTOOL 
 ifeq ($(WITH_THREADS),1)
 CPPFLAGS += -D_REENTRANT
 endif
 
 # The compiler and its options.
 CC = gcc.exe
-CFLAGS += -DWIN32 -D_WINDOWS -D_MBCS
+CFLAGS += -DWIN32 -D_WINDOWS -D_MBCS -DNOLIBTOOL 
 CFLAGS += -I$(XML_SRCDIR) -I$(XML_SRCDIR)/include -I$(INCPREFIX)
 ifneq ($(WITH_THREADS),no)
 CFLAGS += -D_REENTRANT
diff --git a/win32/Makefile.msvc b/win32/Makefile.msvc
index 2409905..908c088 100644
--- a/win32/Makefile.msvc
+++ b/win32/Makefile.msvc
@@ -36,14 +36,14 @@ UTILS_INTDIR = int.utils.msvc
 
 # The preprocessor and its options.
 CPP = cl.exe /EP
-CPPFLAGS = /nologo /I$(XML_SRCDIR)\include
+CPPFLAGS = /nologo /I$(XML_SRCDIR)\include /D "NOLIBTOOL" 
 !if "$(WITH_THREADS)" != "no"
 CPPFLAGS = $(CPPFLAGS) /D "_REENTRANT"
 !endif
 
 # The compiler and its options.
 CC = cl.exe
-CFLAGS = /nologo /D "WIN32" /D "_WINDOWS" /D "_MBCS" /W1 $(CRUNTIME)
+CFLAGS = /nologo /D "WIN32" /D "_WINDOWS" /D "_MBCS"  /D "NOLIBTOOL" /W1 $(CRUNTIME)
 CFLAGS = $(CFLAGS) /I$(XML_SRCDIR) /I$(XML_SRCDIR)\include /I$(INCPREFIX)
 !if "$(WITH_THREADS)" != "no"
 CFLAGS = $(CFLAGS) /D "_REENTRANT"