# HG changeset patch
# User Elliott Sales de Andrade <qulogic@pidgin.im>
# Date 1320631679 0
# Node ID 08151b40c598674cbf575c5a1764d11a9fb75ba2
# Parent  ec6371d4cae82a68edafc2194f54dc4d6f9aba6a# Parent  ab736b16bb263fc7031164640f65c9037ba690d0
merge of '071d7e809e0a4532e6dc367a6f05ea43e1ab0de0'
     and 'f7828c5032d27f14c4543fe56ed1b5cecb5517f7'

diff -r ec6371d4cae8 -r 08151b40c598 libpurple/plugins/ssl/Makefile.am
--- a/libpurple/plugins/ssl/Makefile.am	Sun Nov 06 20:31:14 2011 +0000
+++ b/libpurple/plugins/ssl/Makefile.am	Mon Nov 07 02:07:59 2011 +0000
@@ -9,30 +9,15 @@
 
 if PLUGINS
 
-# I'm sorry to report that Automake Conditionals don't support
-#   if USE_GNUTLS && USE_NSS
-# but only support testing a single variable. Hence:
-
+plugin_LTLIBRARIES = \
+	ssl.la
 if USE_GNUTLS
-if USE_NSS
-plugin_LTLIBRARIES = \
-	ssl.la           \
-	ssl-gnutls.la    \
-	ssl-nss.la
-else
-plugin_LTLIBRARIES = \
-	ssl.la           \
+plugin_LTLIBRARIES += \
 	ssl-gnutls.la
 endif
-else
 if USE_NSS
-plugin_LTLIBRARIES = \
-	ssl.la           \
+plugin_LTLIBRARIES += \
 	ssl-nss.la
-else
-plugin_LTLIBRARIES = \
-	ssl.la
-endif
 endif
 
 ssl_la_SOURCES        = ssl.c
@@ -56,3 +41,4 @@
 
 ssl_gnutls_la_CFLAGS = $(AM_CPPFLAGS) $(GNUTLS_CFLAGS)
 ssl_nss_la_CFLAGS = $(AM_CPPFLAGS) $(NSS_CFLAGS)
+