cpw.ljfisher.ssl_client_auth: 65c0d56f: Add support for building against gnutls ...

[lucas.fisher at gmail.com]

----------------------------------------------------------------------
Revision: 65c0d56f65aaf8ec125b282af5f189fa5e50c11e
Parent:   e5ecbeb07bfaa0d7ed2479a08457ee87450b89f2
Author:   lucas.fisher at gmail.com
Date:     09/18/11 21:12:21
Branch:   im.pidgin.cpw.ljfisher.ssl_client_auth
URL: http://d.pidgin.im/viewmtn/revision/info/65c0d56f65aaf8ec125b282af5f189fa5e50c11e

Changelog: 

Add support for building against gnutls on Windows

Changes against parent e5ecbeb07bfaa0d7ed2479a08457ee87450b89f2

  patched  libpurple/plugins/ssl/Makefile.mingw

-------------- next part --------------
============================================================
--- libpurple/plugins/ssl/Makefile.mingw	7008bce9150547e15b161a634ef457a9ed622ea4
+++ libpurple/plugins/ssl/Makefile.mingw	9d5db521f22bdf1c455017e31edd74e5c9e6ef9c
@@ -12,6 +12,7 @@ TARGET_NSS = ssl-nss
 ##
 TARGET = ssl
 TARGET_NSS = ssl-nss
+TARGET_GNUTLS = ssl-gnutls
 
 NEEDED_DLLS = \
 			$(NSS_TOP)/lib/freebl3.dll \
@@ -24,8 +25,14 @@ NEEDED_DLLS = \
 			$(NSS_TOP)/lib/smime3.dll \
 			$(NSS_TOP)/lib/softokn3.dll \
                         $(NSS_TOP)/lib/sqlite3.dll \
-			$(NSS_TOP)/lib/ssl3.dll 
+			$(NSS_TOP)/lib/ssl3.dll \
+			$(GNUTLS_TOP)/bin/libgnutls-26.dll \
+			$(GNUTLS_TOP)/bin/libgnutls-extra-26.dll \
+			$(GNUTLS_TOP)/bin/libgcrypt-11.dll \
+			$(GNUTLS_TOP)/bin/libtasn1-3.dll \
+			$(GNUTLS_TOP)/bin/libgpg-error-0.dll \
 
+
 ##
 ## INCLUDE PATHS
 ##
@@ -36,19 +43,23 @@ INCLUDE_PATHS +=	-I. \
 			-I$(PURPLE_TOP) \
 			-I$(PURPLE_TOP)/win32 \
 			-I$(PIDGIN_TREE_TOP) \
-			-I$(NSS_TOP)/include
+			-I$(NSS_TOP)/include \
+			-I$(GNUTLS_TOP)/include
 
 LIB_PATHS +=		-L$(GTK_TOP)/lib \
 			-L$(PURPLE_TOP) \
-			-L$(NSS_TOP)/lib
+			-L$(NSS_TOP)/lib \
+			-L$(GNUTLS_TOP)/lib
 
 ##
 ##  SOURCES, OBJECTS
 ##
 C_SRC =			ssl.c
 C_SRC_NSS =		ssl-nss.c
+C_SRC_GNUTLS = 	ssl-gnutls.c
 OBJECTS = $(C_SRC:%.c=%.o)
 OBJECTS_NSS = $(C_SRC_NSS:%.c=%.o)
+OBJECTS_GNUTLS = $(C_SRC_GNUTLS:%.c=%.o)
 
 ##
 ## LIBRARIES
@@ -61,7 +72,10 @@ LIBS =	\
 			-lnss3 \
 			-lnspr4 \
 			-lssl3 \
-			-lsmime3
+			-lsmime3 \
+			-lgnutls \
+			-lgcrypt \
+			-ltasn1
 
 include $(PIDGIN_COMMON_RULES)
 
@@ -70,14 +84,15 @@ include $(PIDGIN_COMMON_RULES)
 ##
 .PHONY: all install clean
 
-all: $(TARGET).dll $(TARGET_NSS).dll
+all: $(TARGET).dll $(TARGET_NSS).dll $(TARGET_GNUTLS).dll
 
 install: all $(PURPLE_INSTALL_PLUGINS_DIR) $(PURPLE_INSTALL_DIR)
 	cp $(TARGET).dll $(PURPLE_INSTALL_PLUGINS_DIR)
 	cp $(TARGET_NSS).dll $(PURPLE_INSTALL_PLUGINS_DIR)
+	cp $(TARGET_GNUTLS).dll $(PURPLE_INSTALL_PLUGINS_DIR)
 	cp $(NEEDED_DLLS) $(PURPLE_INSTALL_DIR)
 
-$(OBJECTS) $(OBJECTS_NSS): $(PURPLE_CONFIG_H)
+$(OBJECTS) $(OBJECTS_NSS) $(OBJECTS_GNUTLS): $(PURPLE_CONFIG_H)
 
 ##
 ## BUILD DLL
@@ -88,10 +103,13 @@ $(TARGET_NSS).dll: $(PURPLE_DLL) $(OBJEC
 $(TARGET_NSS).dll: $(PURPLE_DLL) $(OBJECTS_NSS)
 	$(CC) -shared $(OBJECTS_NSS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -o $(TARGET_NSS).dll
 
+$(TARGET_GNUTLS).dll: $(PURPLE_DLL) $(OBJECTS_GNUTLS)
+	$(CC) -shared $(OBJECTS_GNUTLS) $(LIB_PATHS) $(LIBS) $(DLL_LD_FLAGS) -o $(TARGET_GNUTLS).dll
+
 ##
 ## CLEAN RULES
 ##
 clean:
-	rm -f $(OBJECTS) $(OBJECTS_NSS) $(TARGET).dll $(TARGET_NSS).dll
+	rm -f $(OBJECTS) $(OBJECTS_NSS) $(OBJECTS_GNUTLS) $(TARGET).dll $(TARGET_NSS).dll $(TARGET_GNUTLS).dll
 
 include $(PIDGIN_COMMON_TARGETS)