commit df4c4e3330613825e6bba1588f9918338c31bcd8
parent 413f51eb16bd7cbd4a7c96dc8b7914eaf47d41bd
Author: Michael Rasmussen <mir@datanom.net>
Date: Sat, 30 Jul 2011 22:33:18 +0000
2011-07-30 [mir] 3.7.9cvs38
* src/etpan/Makefile.am
* src/plugins/pgpcore/Makefile.am
* src/plugins/pgpmime/Makefile.am
* src/plugins/smime/Makefile.am
Fix broken build on Debian Sid. enchant.h cannot be
found unless $(ENCHANT_CFLAGS) and $(ENCHANT_LIBS) are
present in Makefile.am. Apparently enchant.h in older
versions were placed in /usr/include which is always
scanned be default.
Diffstat:
7 files changed, 27 insertions(+), 6 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,15 @@
+2011-07-30 [mir] 3.7.9cvs38
+
+ * src/etpan/Makefile.am
+ * src/plugins/pgpcore/Makefile.am
+ * src/plugins/pgpmime/Makefile.am
+ * src/plugins/smime/Makefile.am
+ Fix broken build on Debian Sid. enchant.h cannot be
+ found unless $(ENCHANT_CFLAGS) and $(ENCHANT_LIBS) are
+ present in Makefile.am. Apparently enchant.h in older
+ versions were placed in /usr/include which is always
+ scanned be default.
+
2011-07-21 [mones] 3.7.9cvs37
* src/common/plugin.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -4189,3 +4189,4 @@
( cvs diff -u -r 1.1.2.4 -r 1.1.2.5 claws-mail.desktop; ) > 3.7.9cvs35.patchset
( cvs diff -u -r 1.1.2.56 -r 1.1.2.57 manual/advanced.xml; cvs diff -u -r 1.1.2.17 -r 1.1.2.18 manual/glossary.xml; cvs diff -u -r 1.1.2.18 -r 1.1.2.19 manual/es/advanced.xml; cvs diff -u -r 1.1.2.5 -r 1.1.2.6 manual/es/glossary.xml; ) > 3.7.9cvs36.patchset
( cvs diff -u -r 1.13.2.42 -r 1.13.2.43 src/common/plugin.c; cvs diff -u -r 1.5.2.16 -r 1.5.2.17 src/common/plugin.h; ) > 3.7.9cvs37.patchset
+( cvs diff -u -r 1.1.4.9 -r 1.1.4.10 src/etpan/Makefile.am; cvs diff -u -r 1.1.2.11 -r 1.1.2.12 src/plugins/pgpcore/Makefile.am; cvs diff -u -r 1.1.2.11 -r 1.1.2.12 src/plugins/pgpmime/Makefile.am; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/smime/Makefile.am; ) > 3.7.9cvs38.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
MICRO_VERSION=9
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=37
+EXTRA_VERSION=38
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
diff --git a/src/etpan/Makefile.am b/src/etpan/Makefile.am
@@ -23,10 +23,12 @@ INCLUDES = \
AM_CPPFLAGS = \
$(GTK_CFLAGS) \
$(LIBETPAN_CFLAGS) \
- $(MAEMO_CFLAGS)
+ $(MAEMO_CFLAGS) \
+ $(ENCHANT_CFLAGS)
libclawsetpan_la_LIBADD = \
../common/libclawscommon.la \
$(GTK_LIBS) \
$(LIBETPAN_LIBS) \
- $(MAEMO_LIBS)
+ $(MAEMO_LIBS) \
+ $(ENCHANT_LIBS)
diff --git a/src/plugins/pgpcore/Makefile.am b/src/plugins/pgpcore/Makefile.am
@@ -69,7 +69,8 @@ pgpcore_la_LIBADD = $(cygwin_export_lib) $(plugin_ldadd) \
$(GTK_LIBS) \
$(GPGME_LIBS) \
$(MAEMO_LIBS) \
- $(CONIC_LIBS)
+ $(CONIC_LIBS) \
+ $(ENCHANT_LIBS)
INCLUDES = \
-I$(top_srcdir)/src \
@@ -83,6 +84,7 @@ AM_CPPFLAGS = \
$(GPGME_CFLAGS) \
$(MAEMO_CFLAGS) \
$(CONIC_CFLAGS) \
+ $(ENCHANT_CFLAGS) \
-Wno-deprecated-declarations
clean-local:
diff --git a/src/plugins/pgpmime/Makefile.am b/src/plugins/pgpmime/Makefile.am
@@ -67,7 +67,8 @@ pgpmime_la_LIBADD = $(plugin_ldadd) $(pgpcore_lib) $(cygwin_export_lib) \
$(GTK_LIBS) \
$(GPGME_LIBS) \
$(MAEMO_LIBS) \
- $(CONIC_LIBS)
+ $(CONIC_LIBS) \
+ $(ENCHANT_LIBS)
INCLUDES = \
-I$(top_srcdir)/src \
@@ -81,6 +82,7 @@ AM_CPPFLAGS = \
$(GPGME_CFLAGS) \
$(MAEMO_CFLAGS) \
$(CONIC_CFLAGS) \
+ $(ENCHANT_CFLAGS) \
-Wno-deprecated-declarations
clean-local:
diff --git a/src/plugins/smime/Makefile.am b/src/plugins/smime/Makefile.am
@@ -67,7 +67,8 @@ smime_la_DEPENDENCIES = $(plugin_deps)
smime_la_LIBADD = $(plugin_ldadd) $(pgpcore_lib) $(cygwin_export_lib) \
$(GTK_LIBS) \
$(GPGME_LIBS) \
- $(CONIC_LIBS)
+ $(CONIC_LIBS) \
+ $(ENCHANT_LIBS)
INCLUDES = \
-I$(top_srcdir)/src \
@@ -81,6 +82,7 @@ AM_CPPFLAGS = \
$(GPGME_CFLAGS) \
$(MAEMO_CFLAGS) \
$(CONIC_CFLAGS) \
+ $(ENCHANT_CFLAGS) \
-Wno-deprecated-declarations
clean-local:
