Mercurial > pidgin
changeset 22396:801116601a7b
Avoid saying "Cyrus SASL: Disabled" in the About box on Win32 when it's not true!
| author | Kevin Stange <kevin@simguy.net> |
|---|---|
| date | Sat, 01 Mar 2008 09:42:07 +0000 |
| parents | 85fbff54425e |
| children | ff1258551f79 b3dbd42c228c |
| files | libpurple/protocols/jabber/Makefile.mingw libpurple/win32/global.mak |
| diffstat | 2 files changed, 4 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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).