pidgin: f7828c50: Simplify SSL Makefile.am by using += on ...
qulogic at pidgin.im
qulogic at pidgin.im
Mon Nov 7 02:38:12 EST 2011
----------------------------------------------------------------------
Revision: f7828c5032d27f14c4543fe56ed1b5cecb5517f7
Parent: 941f205e71bee6f0fe79442af21238c088eecbac
Author: qulogic at pidgin.im
Date: 11/06/11 01:28:11
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/f7828c5032d27f14c4543fe56ed1b5cecb5517f7
Changelog:
Simplify SSL Makefile.am by using += on variables.
Changes against parent 941f205e71bee6f0fe79442af21238c088eecbac
patched libpurple/plugins/ssl/Makefile.am
-------------- next part --------------
============================================================
--- libpurple/plugins/ssl/Makefile.am 4dc470b3e95ae11960e40bfda08d0f4567fc9c1f
+++ libpurple/plugins/ssl/Makefile.am 41a1cffb7e4d83d9b51be3828c5361fc4ba0c65d
@@ -9,31 +9,16 @@ if PLUGINS
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:
-
-if USE_GNUTLS
-if USE_NSS
plugin_LTLIBRARIES = \
- ssl.la \
- ssl-gnutls.la \
- ssl-nss.la
-else
-plugin_LTLIBRARIES = \
- ssl.la \
+ ssl.la
+if USE_GNUTLS
+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
ssl_gnutls_la_SOURCES = ssl-gnutls.c
@@ -56,3 +41,4 @@ ssl_nss_la_CFLAGS = $(AM_CPPFLAGS) $(NSS
ssl_gnutls_la_CFLAGS = $(AM_CPPFLAGS) $(GNUTLS_CFLAGS)
ssl_nss_la_CFLAGS = $(AM_CPPFLAGS) $(NSS_CFLAGS)
+
More information about the Commits
mailing list