[Xfce4-commits] <xfce4-mailwatch-plugin:master> Add SSL support CFLAGS and LDFLAGS conditionally

[Ján Sučan]

Updating branch refs/heads/master
         to 3bba0ea4c7b1adbddfef5420786e38f6654a6371 (commit)
       from b5f08056d30ce93b937451587586b4d722b1fbde (commit)

commit 3bba0ea4c7b1adbddfef5420786e38f6654a6371
Author: Ján Sučan <sucan at runbox.com>
Date:   Mon Nov 25 00:22:29 2013 +0100

    Add SSL support CFLAGS and LDFLAGS conditionally
    
    Add the flags only when the support is enabled.

 libmailwatch-core/Makefile.am |   16 +++++++++-------
 panel-plugin/Makefile.am      |    8 ++++++--
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/libmailwatch-core/Makefile.am b/libmailwatch-core/Makefile.am
index 3a28f55..9a626bd 100644
--- a/libmailwatch-core/Makefile.am
+++ b/libmailwatch-core/Makefile.am
@@ -26,15 +26,17 @@ libmailwatch_core_la_SOURCES = \
 	mailwatch.c \
 	mailwatch.h
 
-if HAVE_SSL_SUPPORT
-libmailwatch_core_la_SOURCES += \
-	mailwatch-mailbox-gmail.c
-endif
-
 libmailwatch_core_la_CFLAGS = \
 	$(GTHREAD_CFLAGS) \
 	$(GTK_CFLAGS) \
 	$(LIBXFCE4UI_CFLAGS) \
-	$(GNUTLS_CFLAGS) \
-	$(LIBGCRYPT_CFLAGS) \
 	$(PLATFORM_CFLAGS)
+
+if HAVE_SSL_SUPPORT
+libmailwatch_core_la_SOURCES += \
+	mailwatch-mailbox-gmail.c
+
+libmailwatch_core_la_CFLAGS += \
+	$(GNUTLS_CFLAGS) \
+	$(LIBGCRYPT_CFLAGS)
+endif
diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
index 69436a0..a47b776 100644
--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -36,10 +36,14 @@ libmailwatch_la_LIBADD = \
 	$(GTHREAD_LIBS) \
 	$(LIBXFCE4PANEL_LIBS) \
 	$(LIBXFCE4UI_LIBS) \
-	$(GNUTLS_LIBS) \
-	$(LIBGCRYPT_LIBS) \
 	$(EXO_LIBS)
 
+if HAVE_SSL_SUPPORT
+libmailwatch_la_LIBADD += \
+	$(GNUTLS_LIBS) \
+	$(LIBGCRYPT_LIBS)
+endif
+
 #
 # Desktop file
 #