# HG changeset patch
# User Kevin Stange <kevin@simguy.net>
# Date 1204364527 0
# Node ID 801116601a7b1281ccee4a020197580bfc326fd3
# Parent  85fbff54425e93bae52c866359e72ac757087715
Avoid saying "Cyrus SASL: Disabled" in the About box on Win32 when it's not true!

diff -r 85fbff54425e -r 801116601a7b libpurple/protocols/jabber/Makefile.mingw
--- a/libpurple/protocols/jabber/Makefile.mingw	Fri Feb 29 21:11:47 2008 +0000
+++ b/libpurple/protocols/jabber/Makefile.mingw	Sat Mar 01 09:42:07 2008 +0000
@@ -84,7 +84,6 @@
 
 ifeq ($(CYRUS_SASL), 1)
 CYRUS_SASL_TOP := $(WIN32_DEV_TOP)/cyrus-sasl-2.1.22
-CFLAGS += -DHAVE_CYRUS_SASL
 INCLUDE_PATHS += -I$(CYRUS_SASL_TOP)/include
 LIB_PATHS += -L$(CYRUS_SASL_TOP)/lib
 LIBS += -llibsasl
diff -r 85fbff54425e -r 801116601a7b libpurple/win32/global.mak
--- a/libpurple/win32/global.mak	Fri Feb 29 21:11:47 2008 +0000
+++ b/libpurple/win32/global.mak	Sat Mar 01 09:42:07 2008 +0000
@@ -79,6 +79,10 @@
 
 CYRUS_SASL ?= 1
 
+ifeq ($(CYRUS_SASL), 1)
+DEFINES += -DHAVE_CYRUS_SASL
+endif
+
 DEFINES += -DHAVE_CONFIG_H
 
 # Use -g flag when building debug version of Pidgin (including plugins).