/pidgin/main: be46dd6ba024: Fix win32 build for IRC SASL.

[Daniel Atallah]

Changeset: be46dd6ba02478f57d738475dacc4c3c187027c2
Author:	 Daniel Atallah <datallah at pidgin.im>
Date:	 2012-09-19 22:57 -0400
Branch:	 release-2.x.y
URL: http://hg.pidgin.im/pidgin/main/rev/be46dd6ba024

Description:

Fix win32 build for IRC SASL.

diffstat:

 libpurple/Makefile.mingw                  |  17 +++++++++++++++++
 libpurple/protocols/irc/Makefile.mingw    |   7 +++++++
 libpurple/protocols/jabber/Makefile.mingw |  17 -----------------
 libpurple/win32/global.mak                |   1 +
 4 files changed, 25 insertions(+), 17 deletions(-)

diffs (99 lines):

diff --git a/libpurple/Makefile.mingw b/libpurple/Makefile.mingw
--- a/libpurple/Makefile.mingw
+++ b/libpurple/Makefile.mingw
@@ -10,6 +10,19 @@ include $(PIDGIN_TREE_TOP)/libpurple/win
 TARGET = libpurple
 NEEDED_DLLS = $(LIBXML2_TOP)/bin/libxml2-2.dll
 
+ifeq ($(CYRUS_SASL), 1)
+NEEDED_DLLS += $(CYRUS_SASL_TOP)/bin/libsasl.dll
+
+CYRUS_SASL_PLUGINS = \
+                        $(CYRUS_SASL_TOP)/bin/sasl2/saslANONYMOUS.dll \
+                        $(CYRUS_SASL_TOP)/bin/sasl2/saslCRAMMD5.dll \
+                        $(CYRUS_SASL_TOP)/bin/sasl2/saslDIGESTMD5.dll \
+                        $(CYRUS_SASL_TOP)/bin/sasl2/saslGSSAPI.dll \
+                        $(CYRUS_SASL_TOP)/bin/sasl2/saslLOGIN.dll \
+                        $(CYRUS_SASL_TOP)/bin/sasl2/saslPLAIN.dll
+
+endif
+
 ##
 ## INCLUDE PATHS
 ##
@@ -126,6 +139,10 @@ all: $(TARGET).dll
 install_shallow: $(PURPLE_INSTALL_DIR) $(TARGET).dll
 	cp $(TARGET).dll $(PURPLE_INSTALL_DIR)
 	cp $(NEEDED_DLLS) $(PURPLE_INSTALL_DIR)
+ifeq ($(CYRUS_SASL), 1)
+	mkdir -p $(PURPLE_INSTALL_DIR)/sasl2
+	cp $(CYRUS_SASL_PLUGINS) $(PURPLE_INSTALL_DIR)/sasl2
+endif
 
 install: install_shallow all
 	$(MAKE) -C $(PURPLE_PROTOS_TOP) -f $(MINGW_MAKEFILE) install
diff --git a/libpurple/protocols/irc/Makefile.mingw b/libpurple/protocols/irc/Makefile.mingw
--- a/libpurple/protocols/irc/Makefile.mingw
+++ b/libpurple/protocols/irc/Makefile.mingw
@@ -54,6 +54,13 @@ LIBS =	\
 			-lintl \
 			-lpurple
 
+
+ifeq ($(CYRUS_SASL), 1)
+INCLUDE_PATHS += -I$(CYRUS_SASL_TOP)/include
+LIB_PATHS += -L$(CYRUS_SASL_TOP)/bin
+LIBS += -llibsasl
+endif
+
 include $(PIDGIN_COMMON_RULES)
 
 ##
diff --git a/libpurple/protocols/jabber/Makefile.mingw b/libpurple/protocols/jabber/Makefile.mingw
--- a/libpurple/protocols/jabber/Makefile.mingw
+++ b/libpurple/protocols/jabber/Makefile.mingw
@@ -105,21 +105,9 @@ LIBS = \
 			-lpurple
 
 ifeq ($(CYRUS_SASL), 1)
-CYRUS_SASL_TOP := $(WIN32_DEV_TOP)/cyrus-sasl-2.1.25
 INCLUDE_PATHS += -I$(CYRUS_SASL_TOP)/include
 LIB_PATHS += -L$(CYRUS_SASL_TOP)/bin
 LIBS += -llibsasl
-CYRUS_SASL_DLLS = \
-			$(CYRUS_SASL_TOP)/bin/libsasl.dll
-
-CYRUS_SASL_PLUGINS = \
-			$(CYRUS_SASL_TOP)/bin/sasl2/saslANONYMOUS.dll \
-			$(CYRUS_SASL_TOP)/bin/sasl2/saslCRAMMD5.dll \
-			$(CYRUS_SASL_TOP)/bin/sasl2/saslDIGESTMD5.dll \
-			$(CYRUS_SASL_TOP)/bin/sasl2/saslGSSAPI.dll \
-			$(CYRUS_SASL_TOP)/bin/sasl2/saslLOGIN.dll \
-			$(CYRUS_SASL_TOP)/bin/sasl2/saslPLAIN.dll
-
 endif
 
 include $(PIDGIN_COMMON_RULES)
@@ -134,11 +122,6 @@ all: $(TARGET).dll $(XMPP_TARGET).dll
 install: all $(DLL_INSTALL_DIR)
 	cp $(XMPP_TARGET).dll $(DLL_INSTALL_DIR)
 	cp $(TARGET).dll $(PURPLE_INSTALL_DIR)
-ifeq ($(CYRUS_SASL), 1)
-	mkdir -p $(PURPLE_INSTALL_DIR)/sasl2
-	cp $(CYRUS_SASL_DLLS) $(PURPLE_INSTALL_DIR)
-	cp $(CYRUS_SASL_PLUGINS) $(PURPLE_INSTALL_DIR)/sasl2
-endif
 
 $(OBJECTS): $(PURPLE_CONFIG_H)
 
diff --git a/libpurple/win32/global.mak b/libpurple/win32/global.mak
--- a/libpurple/win32/global.mak
+++ b/libpurple/win32/global.mak
@@ -23,6 +23,7 @@ SILC_TOOLKIT ?= $(WIN32_DEV_TOP)/silc-to
 TCL_LIB_TOP ?= $(WIN32_DEV_TOP)/tcl-8.4.5
 GSTREAMER_TOP ?= $(WIN32_DEV_TOP)/gstreamer-0.10.13
 GCC_SSP_TOP ?= $(WIN32_DEV_TOP)/gcc-core-4.4.0-mingw32-dll
+CYRUS_SASL_TOP ?= $(WIN32_DEV_TOP)/cyrus-sasl-2.1.25
 
 # Where we installing this stuff to?
 PIDGIN_INSTALL_DIR := $(PIDGIN_TREE_TOP)/win32-install-dir