1 |
angelos 11/05/31 11:08:37 |
2 |
|
3 |
Added: |
4 |
xfce4-mailwatch-plugin-1.1.0-link_to_libgcrypt.patch |
5 |
Log: |
6 |
Fix underlinking (bug #369457) |
7 |
|
8 |
(Portage version: 2.2.0_alpha37/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.1 xfce-extra/xfce4-mailwatch-plugin/files/xfce4-mailwatch-plugin-1.1.0-link_to_libgcrypt.patch |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/xfce-extra/xfce4-mailwatch-plugin/files/xfce4-mailwatch-plugin-1.1.0-link_to_libgcrypt.patch?rev=1.1&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/xfce-extra/xfce4-mailwatch-plugin/files/xfce4-mailwatch-plugin-1.1.0-link_to_libgcrypt.patch?rev=1.1&content-type=text/plain |
15 |
|
16 |
Index: xfce4-mailwatch-plugin-1.1.0-link_to_libgcrypt.patch |
17 |
=================================================================== |
18 |
diff --git a/configure.ac b/configure.ac |
19 |
index df02271..e17375f 100644 |
20 |
--- a/configure.ac |
21 |
+++ b/configure.ac |
22 |
@@ -82,6 +82,7 @@ XDT_CHECK_OPTIONAL_PACKAGE([GNUTLS], [gnutls], [1.2.0], [ssl], |
23 |
[gnutls support for secure IMAP/POP3 connections], [yes]) |
24 |
if test "x$GNUTLS_FOUND" = "xyes"; then |
25 |
AC_DEFINE([HAVE_SSL_SUPPORT], [1], [Define if SSL support is enabled]) |
26 |
+ AM_PATH_LIBGCRYPT() |
27 |
fi |
28 |
AM_CONDITIONAL([HAVE_SSL_SUPPORT], [test "x$GNUTLS_FOUND" = "xyes"]) |
29 |
|
30 |
diff --git a/libmailwatch-core/Makefile.am b/libmailwatch-core/Makefile.am |
31 |
index 181992e..03a8675 100644 |
32 |
--- a/libmailwatch-core/Makefile.am |
33 |
+++ b/libmailwatch-core/Makefile.am |
34 |
@@ -20,10 +20,6 @@ libmailwatch_core_la_SOURCES = \ |
35 |
mailwatch.c \ |
36 |
mailwatch.h |
37 |
|
38 |
-if HAVE_SSL_SUPPORT |
39 |
-libmailwatch_core_la_SOURCES += mailwatch-mailbox-gmail.c |
40 |
-endif |
41 |
- |
42 |
libmailwatch_core_la_CFLAGS = \ |
43 |
@GTHREAD_CFLAGS@ \ |
44 |
@GTK_CFLAGS@ \ |
45 |
@@ -31,3 +27,9 @@ libmailwatch_core_la_CFLAGS = \ |
46 |
@GNUTLS_CFLAGS@ \ |
47 |
-DDATADIR=\"$(datadir)\" \ |
48 |
-DLOCALEDIR=\"$(localedir)\" |
49 |
+ |
50 |
+if HAVE_SSL_SUPPORT |
51 |
+libmailwatch_core_la_SOURCES += mailwatch-mailbox-gmail.c |
52 |
+libmailwatch_core_la_CFLAGS += @LIBGCRYPT_CFLAGS@ |
53 |
+libmailwatch_core_la_LIBADD = @LIBGCRYPT_LIBS@ |
54 |
+endif |