2011-07-30 [mir] 3.7.9cvs38
authorMichael Rasmussen <mir@datanom.net>
Sat, 30 Jul 2011 22:33:18 +0000 (22:33 +0000)
committerMichael Rasmussen <mir@datanom.net>
Sat, 30 Jul 2011 22:33:18 +0000 (22:33 +0000)
* 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.

ChangeLog
PATCHSETS
configure.ac
src/etpan/Makefile.am
src/plugins/pgpcore/Makefile.am
src/plugins/pgpmime/Makefile.am
src/plugins/smime/Makefile.am

index c436c31fcfb9c17e7f2f36bca9bc00305ef903a4..0252a59b341b218d21384945ccb05241d8693e39 100644 (file)
--- 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
index c7197c215b9952c51504b675ab4de64b158ee425..9fe6bbc49cec9f2ad5283a12bc3c3a0deb4c9af9 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( 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
index 4a7cd383aeab50f1781e7a8c6d0e791bf6229c44..81349f6bb6a14695ea8bd7413938bc2ae6a8d63e 100644 (file)
@@ -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=
 
index 5b21cb19eb0cfbf2d10db12ab71986d0f7c7e05a..b70dc616d533bc52862f80b097722a9d7fabe360 100644 (file)
@@ -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)
index d1ae2a2887505061da4d0d5be792f2280190d787..5876615a384522c8cb763c0ce47facf3e09fc49d 100644 (file)
@@ -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:
index 49614ef438d2f1a5b59264038641cee337b74491..9b41616bcb5ac348522447eda240536d627d44cb 100644 (file)
@@ -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:
index cc7f5733906816bd0ccac369e82bd9c6e30532c1..7e485c571e475262af86f3af140479321cf79994 100644 (file)
@@ -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: