[libxml2] Fix the Windows build files

[Daniel Veillard <veillard src gnome org>]

commit f1da8abb629cff85cadb3e2ff25b26419a1390f7
Author: Patrick von Reth <patrick vonreth gmail com>
Date:   Wed Sep 14 16:00:28 2011 +0800

    Fix the Windows build files
    
    Patches comming from KDE project for Windows portability
    
    https://projects.kde.org/projects/kdesupport/emerge/repository/revisions/master/entry/portage/testing/libxml2-test/libxml2-2.7.8-20110801.diff
    
    To build libxml2 I had to patch the build system a little bit.
    The windows build system tries to link about zdll, but on windows
    its called zlib* too, so linking against z is enough.
    Also the --include and the --lib command was ignored.
    
    For the http and ftp stuff linking against some windows library's was
    forgotten for mingw.

 win32/Makefile.mingw |   14 +++++++++-----
 win32/Makefile.msvc  |    4 +++-
 win32/configure.js   |    6 +++---
 3 files changed, 15 insertions(+), 9 deletions(-)
---
diff --git a/win32/Makefile.mingw b/win32/Makefile.mingw
index a689f31..0f8198b 100644
--- a/win32/Makefile.mingw
+++ b/win32/Makefile.mingw
@@ -41,7 +41,7 @@ endif
 # The compiler and its options.
 CC = gcc.exe
 CFLAGS += -DWIN32 -D_WINDOWS -D_MBCS -DNOLIBTOOL 
-CFLAGS += -I$(XML_SRCDIR) -I$(XML_SRCDIR)/include -I$(INCPREFIX)
+CFLAGS += -I$(XML_SRCDIR) -I$(XML_SRCDIR)/include -I$(INCPREFIX) $(INCLUDE)
 ifneq ($(WITH_THREADS),no)
 CFLAGS += -D_REENTRANT
 endif
@@ -66,20 +66,22 @@ LD = gcc.exe
 LDFLAGS += -Wl,--major-image-version,$(LIBXML_MAJOR_VERSION)
 LDFLAGS += -Wl,--minor-image-version,$(LIBXML_MINOR_VERSION)
 LDFLAGS += -Wl,-L,$(BINDIR) -Wl,-L,$(LIBPREFIX)
-LIBS = 
+LIBS =
 ifeq ($(WITH_FTP),1)
 CFLAGS += -D_WINSOCKAPI_
-LIBS += -lwsock32
+LIBS += -lwsock32 -lws2_32
 endif 
 ifeq ($(WITH_HTTP),1)
 CFLAGS += -D_WINSOCKAPI_
-LIBS += -lwsock32
+LIBS += -lwsock32 -lws2_32
 endif 
 ifeq ($(WITH_ICONV),1)
 LIBS += -liconv
 endif 
 ifeq ($(WITH_ZLIB),1)
-LIBS += -lzdll
+# Could be named differently
+# LIBS += -lzdll
+LIBS += -lz
 endif
 ifeq ($(WITH_THREADS),posix)
 LIBS += -lpthreadGC
@@ -88,6 +90,8 @@ ifeq ($(WITH_MODULES),1)
 LIBS += -lkernel32
 endif
 
+LIBS += $(LIB)
+
 # The archiver and its options.
 AR = ar.exe
 ARFLAGS = -r
diff --git a/win32/Makefile.msvc b/win32/Makefile.msvc
index 33cb4db..be47b5d 100644
--- a/win32/Makefile.msvc
+++ b/win32/Makefile.msvc
@@ -75,7 +75,9 @@ LIBS = $(LIBS) iconv.lib
 LIBS = $(LIBS) icu.lib
 !endif
 !if "$(WITH_ZLIB)" == "1"
-LIBS = $(LIBS) zdll.lib
+# could be named differently zdll or zlib
+# LIBS = $(LIBS) zdll.lib
+LIBS = $(LIBS) zlib.lib
 !endif
 !if "$(WITH_THREADS)" == "posix"
 LIBS = $(LIBS) pthreadVC.lib
diff --git a/win32/configure.js b/win32/configure.js
index 342fd9d..a815cbb 100644
--- a/win32/configure.js
+++ b/win32/configure.js
@@ -269,8 +269,8 @@ function discoverVersion()
 		vf.WriteLine("CRUNTIME=" + cruntime);
 		vf.WriteLine("VCMANIFEST=" + (vcmanifest? "1" : "0"));
 	} else if (compiler == "mingw") {
-		vf.WriteLine("INCLUDE+=;" + buildInclude);
-		vf.WriteLine("LIB+=;" + buildLib);
+		vf.WriteLine("INCLUDE+= -I" + buildInclude);
+		vf.WriteLine("LIB+= -L" + buildLib);
 	} else if (compiler == "bcb") {
 		vf.WriteLine("INCLUDE=" + buildInclude);
 		vf.WriteLine("LIB=" + buildLib);
@@ -579,7 +579,7 @@ if (buildIncPrefix == "")
 if (buildLibPrefix == "")
 	buildLibPrefix = "$(PREFIX)" + dirSep + "lib";
 if (buildSoPrefix == "")
-	buildSoPrefix = "$(PREFIX)" + dirSep + "lib";
+	buildSoPrefix = "$(PREFIX)" + dirSep + "bin";
 
 // Discover the version.
 discoverVersion();