# HG changeset patch
# User Daniel Atallah <daniel.atallah@gmail.com>
# Date 1149779619 0
# Node ID 34d086c78a0d0d23b9e33f8166f33599a3d9d1e5
# Parent  a415805c745625224224a898316c44dd6bdadb69
[gaim-migrate @ 16234]
Use libxml2 on win32 too.
This increases the installer size by ~400K (oh well).

committer: Tailor Script <tailor@pidgin.im>

diff -r a415805c7456 -r 34d086c78a0d Makefile.mingw
--- a/Makefile.mingw	Thu Jun 08 04:27:04 2006 +0000
+++ b/Makefile.mingw	Thu Jun 08 15:13:39 2006 +0000
@@ -12,6 +12,7 @@
 GAIM_SOUNDS = ./sounds
 GAIM_INSTALL_DIR = ./win32-install-dir
 GTKSPELL_TOP = ../win32-dev/gtkspell-2.0.6/gtkspell
+LIBXML2_DIR = ../win32-dev/libxml2
 IDLETRACK_TOP = $(GAIM_SRC)/win32/IdleTracker
 GTKRC_TOP = ../win32-dev/gtkrc
 OSCAR = $(GAIM_PROTOS)/oscar
@@ -33,7 +34,8 @@
 VERSION := $(shell cat ./VERSION)
 
 NEEDED_DLLS =		$(GTKSPELL_TOP)/libgtkspell.dll \
-			$(IDLETRACK_TOP)/idletrack.dll
+			$(IDLETRACK_TOP)/idletrack.dll \
+			$(LIBXML2_DIR)/bin/libxml2.dll
 
 SOUNDS =		$(GAIM_SOUNDS)/alert.wav \
 			$(GAIM_SOUNDS)/login.wav \
diff -r a415805c7456 -r 34d086c78a0d config.h.mingw
--- a/config.h.mingw	Thu Jun 08 04:27:04 2006 +0000
+++ b/config.h.mingw	Thu Jun 08 15:13:39 2006 +0000
@@ -635,6 +635,8 @@
    <inttypes.h> don't define. */
 /* #undef uintmax_t */
 
+#define HAVE_LIBXML 1
+
 /*
  * Following are added for Win32 version of Gaim
  */
diff -r a415805c7456 -r 34d086c78a0d gaim-installer.nsi
--- a/gaim-installer.nsi	Thu Jun 08 04:27:04 2006 +0000
+++ b/gaim-installer.nsi	Thu Jun 08 15:13:39 2006 +0000
@@ -744,6 +744,7 @@
     Delete "$INSTDIR\idletrack.dll"
     Delete "$INSTDIR\libgtkspell.dll"
     Delete "$INSTDIR\libmeanwhile-1.dll"
+    Delete "$INSTDIR\libxml2.dll"
     Delete "$INSTDIR\nspr4.dll"
     Delete "$INSTDIR\nss3.dll"
     Delete "$INSTDIR\nssckbi.dll"
diff -r a415805c7456 -r 34d086c78a0d src/Makefile.mingw
--- a/src/Makefile.mingw	Thu Jun 08 04:27:04 2006 +0000
+++ b/src/Makefile.mingw	Thu Jun 08 15:13:39 2006 +0000
@@ -18,6 +18,7 @@
 GAIM_INSTALL_DIR :=	$(GAIM_TOP)/win32-install-dir
 NSS_DIR :=		../../win32-dev/nss-3.9
 NSPR_DIR :=		../../win32-dev/nspr-4.4.1
+LIBXML2_DIR :=		../../win32-dev/libxml2
 
 ##
 ## VARIABLE DEFINITIONS
@@ -66,7 +67,8 @@
 			-I$(ASPELL_TOP)/include \
 			-I$(GTKSPELL_TOP) \
 			-I$(NSS_DIR)/include \
-			-I$(NSPR_DIR)/include
+			-I$(NSPR_DIR)/include \
+			-I$(LIBXML2_DIR)/include
 
 
 LIB_PATHS =		-L$(GTK_TOP)/lib \
@@ -74,7 +76,8 @@
 			-L$(IDLETRACK_TOP) \
 			-L$(ASPELL_TOP)/lib \
 			-L$(NSS_DIR)/lib \
-			-L$(NSPR_DIR)/lib
+			-L$(NSPR_DIR)/lib \
+			-L$(LIBXML2_DIR)/lib
 
 ##
 ##  SOURCES, OBJECTS
@@ -191,8 +194,8 @@
 			-lidletrack \
 			-lnss3 \
 			-lnspr4 \
-			-lssl3
-			
+			-lssl3 \
+			-lxml2
 
 EXE_LIBS =
 
diff -r a415805c7456 -r 34d086c78a0d src/protocols/jabber/Makefile.mingw
--- a/src/protocols/jabber/Makefile.mingw	Thu Jun 08 04:27:04 2006 +0000
+++ b/src/protocols/jabber/Makefile.mingw	Thu Jun 08 15:13:39 2006 +0000
@@ -10,6 +10,7 @@
 
 INCLUDE_DIR :=		.
 GTK_TOP :=		../../../../win32-dev/gtk_2_0
+LIBXML2_DIR:=		../../../../win32-dev/libxml2
 GAIM_TOP :=		../../..
 JABBER_ROOT :=		.
 GAIM_INSTALL_DIR :=	$(GAIM_TOP)/win32-install-dir
@@ -50,18 +51,16 @@
 INCLUDE_PATHS +=	-I$(JABBER_ROOT) \
 			-I$(JABBER_ROOT)/win32 \
 			-I$(GTK_TOP)/include \
-			-I$(GTK_TOP)/include/gtk-2.0 \
 			-I$(GTK_TOP)/include/glib-2.0 \
-			-I$(GTK_TOP)/include/pango-1.0 \
-			-I$(GTK_TOP)/include/atk-1.0 \
 			-I$(GTK_TOP)/lib/glib-2.0/include \
-			-I$(GTK_TOP)/lib/gtk-2.0/include \
+			-I$(LIBXML2_DIR)/include \
 			-I$(GAIM_TOP)/src \
 			-I$(GAIM_TOP)/src/win32 \
 			-I$(GAIM_TOP)
 
 
 LIB_PATHS =		-L$(GTK_TOP)/lib \
+			-L$(LIBXML2_DIR)/lib \
 			-L$(GAIM_TOP)/src
 
 
@@ -93,11 +92,9 @@
 ## LIBRARIES
 ##
 
-LIBS =			-lgtk-win32-2.0 \
+LIBS = \
 			-lglib-2.0 \
-			-lgdk-win32-2.0 \
-			-lgmodule-2.0 \
-			-lgobject-2.0 \
+			-lxml2 \
 			-lws2_32 \
 			-lintl \
 			-lgaim