Mercurial > pidgin.yaz

changeset 32817:ab736b16bb26

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Simplify SSL Makefile.am by using += on variables.
author Elliott Sales de Andrade <qulogic@pidgin.im>
date Sun, 06 Nov 2011 05:28:11 +0000
parents 03efb97b552b
children 08151b40c598
files libpurple/plugins/ssl/Makefile.am
diffstat 1 files changed, 5 insertions(+), 19 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/plugins/ssl/Makefile.am	Tue Nov 01 17:28:17 2011 +0000
+++ b/libpurple/plugins/ssl/Makefile.am	Sun Nov 06 05:28:11 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)
+