/pidgin/main: f784f0d12ffe: Update libpurple/plugins/ssl/Makefil...

Daniel Atallah <[email protected]>
Newsgroups gmane.comp.gnome.gaim.cvs
Message-ID <[email protected]>
Changeset: f784f0d12ffe192aae6405d07b213f41affc4ec2
Author:	 Daniel Atallah <[email protected]>
Date:	 2014-11-05 13:24 -0500
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/f784f0d12ffe

Description:

Update libpurple/plugins/ssl/Makefile.am to apply the 3.x.y changes to the new nss_prefs lines.

diffstat:

 libpurple/plugins/ssl/Makefile.am |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (21 lines):

diff --git a/libpurple/plugins/ssl/Makefile.am b/libpurple/plugins/ssl/Makefile.am
--- a/libpurple/plugins/ssl/Makefile.am
+++ b/libpurple/plugins/ssl/Makefile.am
@@ -6,7 +6,7 @@ plugindir = @PURPLE_PLUGINDIR@
 ssl_la_LDFLAGS        = -module @PLUGIN_LDFLAGS@
 ssl_gnutls_la_LDFLAGS = -module @PLUGIN_LDFLAGS@
 ssl_nss_la_LDFLAGS    = -module @PLUGIN_LDFLAGS@
-nss_prefs_la_LDFLAGS  = -module -avoid-version
+nss_prefs_la_LDFLAGS  = -module @PLUGIN_LDFLAGS@
 
 if PLUGINS
 
@@ -31,7 +31,7 @@ nss_prefs_la_SOURCES  = nss-prefs.c
 ssl_la_LIBADD        = @PURPLE_LIBS@
 ssl_gnutls_la_LIBADD = @PURPLE_LIBS@ $(GNUTLS_LIBS)
 ssl_nss_la_LIBADD    = @PURPLE_LIBS@ $(NSS_LIBS)
-nss_prefs_la_LIBADD  = $(GLIB_LIBS) $(NSS_LIBS)
+nss_prefs_la_LIBADD  = @PURPLE_LIBS@ $(NSS_LIBS)
 
 endif # PLUGINS
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.