pidgin: d1ef3871: Avoid saying "Cyrus SASL: Disabled" in t

[kstange at pidgin.im]

-----------------------------------------------------------------
Revision: d1ef38716fb62522b4d8ce47ed39d9e34d2b2c77
Ancestor: c63a4c55b97760fdff56cbf2e3c3530618fef208
Author: kstange at pidgin.im
Date: 2008-03-01T09:42:07
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/d1ef38716fb62522b4d8ce47ed39d9e34d2b2c77

Modified files:
        libpurple/protocols/jabber/Makefile.mingw
        libpurple/win32/global.mak

ChangeLog: 

Avoid saying "Cyrus SASL: Disabled" in the About box on Win32 when it's not true!

-------------- next part --------------
============================================================
--- libpurple/protocols/jabber/Makefile.mingw	e344a2658361874d08ea8e54bc0912467225d6de
+++ libpurple/protocols/jabber/Makefile.mingw	953c88767f528beb9fdee4ab60ed5f4ec37fda61
@@ -84,7 +84,6 @@ CYRUS_SASL_TOP := $(WIN32_DEV_TOP)/cyrus
 
 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
============================================================
--- libpurple/win32/global.mak	e860f0d61bb53eb501a75007cfbda90340c221a2
+++ libpurple/win32/global.mak	2af530775996b37d6f9d0abd70acfac0bdfe948b
@@ -79,6 +79,10 @@ CYRUS_SASL ?= 1
 
 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).