Mercurial > pidgin
changeset 22398:b3dbd42c228c
merge of 'd1ef38716fb62522b4d8ce47ed39d9e34d2b2c77'
and 'f30db84d0b905aeecbbe516037ffdd572852b313'
| author | Sadrul Habib Chowdhury <imadil@gmail.com> |
|---|---|
| date | Sun, 02 Mar 2008 16:43:55 +0000 |
| parents | 801116601a7b (diff) 19f26913fe71 (current diff) |
| children | 46b86c4f2c4f |
| files | |
| diffstat | 2 files changed, 4 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/Makefile.mingw Sun Mar 02 16:43:22 2008 +0000 +++ b/libpurple/protocols/jabber/Makefile.mingw Sun Mar 02 16:43:55 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 Sun Mar 02 16:43:22 2008 +0000 +++ b/libpurple/win32/global.mak Sun Mar 02 16:43:55 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).