[Commits] [SCM] claws branch, master, updated. 3.16.0-45-g09301b6

ticho at claws-mail.org ticho at claws-mail.org
Fri Feb 9 20:22:33 CET 2018 

The branch, master has been updated
       via  09301b6e73e4af1b03b6f19d340dd909cf527bcc (commit)
      from  5ab9e6e799f34e73d648817a295051a8da981837 (commit)

Summary of changes:
 configure.ac                           |    1 -
 src/plugins/address_keeper/Makefile.am |    3 ++-
 src/plugins/att_remover/Makefile.am    |    3 ++-
 src/plugins/attachwarner/Makefile.am   |    3 ++-
 src/plugins/bsfilter/Makefile.am       |    3 ++-
 src/plugins/clamd/Makefile.am          |    3 ++-
 src/plugins/dillo/Makefile.am          |    3 ++-
 src/plugins/fancy/Makefile.am          |    1 +
 src/plugins/libravatar/Makefile.am     |    3 ++-
 src/plugins/mailmbox/Makefile.am       |    3 ++-
 src/plugins/managesieve/Makefile.am    |    1 +
 src/plugins/notification/Makefile.am   |    1 +
 src/plugins/pdf_viewer/Makefile.am     |    1 +
 src/plugins/perl/Makefile.am           |    1 +
 src/plugins/python/Makefile.am         |    1 +
 src/plugins/rssyl/Makefile.am          |    1 +
 src/plugins/spam_report/Makefile.am    |    3 ++-
 src/plugins/vcalendar/Makefile.am      |    1 +
 18 files changed, 26 insertions(+), 10 deletions(-)


- Log -----------------------------------------------------------------
commit 09301b6e73e4af1b03b6f19d340dd909cf527bcc
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Fri Feb 9 20:21:41 2018 +0100

    Do not put enchant's CFLAGS into main CFLAGS make variable.
    
    Handle its CFLAGS just like all other libraries'.

diff --git a/configure.ac b/configure.ac
index ba7e489..87c95e5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -594,7 +594,6 @@ if test $enable_enchant = yes; then
 		AC_DEFINE(USE_ENCHANT, 1, enchant)
 		echo "Building with enchant"
 		enable_enchant=yes
-		CFLAGS="$CFLAGS `$PKG_CONFIG --cflags enchant`"
 	],
 	[
 		echo "Building without enchant-notification"
diff --git a/src/plugins/address_keeper/Makefile.am b/src/plugins/address_keeper/Makefile.am
index 56e7965..4a49ae1 100644
--- a/src/plugins/address_keeper/Makefile.am
+++ b/src/plugins/address_keeper/Makefile.am
@@ -71,7 +71,8 @@ address_keeper_la_LIBADD = $(plugin_ldadd) $(cygwin_export_lib) \
 address_keeper_la_CPPFLAGS = \
 	$(IFLAGS) \
 	$(GLIB_CFLAGS) \
-	$(GTK_CFLAGS)
+	$(GTK_CFLAGS) \
+	$(ENCHANT_CFLAGS)
 
 address_keeper_la_SOURCES = \
 	address_keeper.c address_keeper.h \
diff --git a/src/plugins/att_remover/Makefile.am b/src/plugins/att_remover/Makefile.am
index 99bfc6f..543b5bc 100644
--- a/src/plugins/att_remover/Makefile.am
+++ b/src/plugins/att_remover/Makefile.am
@@ -74,4 +74,5 @@ att_remover_la_DEPENDENCIES = $(plugin_deps)
 att_remover_la_CPPFLAGS = \
 	$(IFLAGS) \
 	$(GLIB_CFLAGS) \
-	$(GTK_CFLAGS)
+	$(GTK_CFLAGS) \
+	$(ENCHANT_CFLAGS)
diff --git a/src/plugins/attachwarner/Makefile.am b/src/plugins/attachwarner/Makefile.am
index 826279e..146180b 100644
--- a/src/plugins/attachwarner/Makefile.am
+++ b/src/plugins/attachwarner/Makefile.am
@@ -71,7 +71,8 @@ attachwarner_la_LIBADD = $(plugin_ldadd) $(cygwin_export_lib) \
 attachwarner_la_CPPFLAGS = \
 	$(IFLAGS) \
 	$(GLIB_CFLAGS) \
-	$(GTK_CFLAGS)
+	$(GTK_CFLAGS) \
+	$(ENCHANT_CFLAGS)
 
 attachwarner_la_SOURCES = \
 	attachwarner.c attachwarner.h \
diff --git a/src/plugins/bsfilter/Makefile.am b/src/plugins/bsfilter/Makefile.am
index a39eb05..0b92019 100644
--- a/src/plugins/bsfilter/Makefile.am
+++ b/src/plugins/bsfilter/Makefile.am
@@ -71,7 +71,8 @@ bsfilter_la_LIBADD = $(plugin_ldadd) $(cygwin_export_lib) \
 bsfilter_la_CPPFLAGS = \
 	$(IFLAGS) \
 	$(GLIB_CFLAGS) \
-	$(GTK_CFLAGS)
+	$(GTK_CFLAGS) \
+	$(ENCHANT_CFLAGS)
 
 bsfilter_la_SOURCES = \
 	bsfilter.c bsfilter.h \
diff --git a/src/plugins/clamd/Makefile.am b/src/plugins/clamd/Makefile.am
index 72bb101..8099afb 100644
--- a/src/plugins/clamd/Makefile.am
+++ b/src/plugins/clamd/Makefile.am
@@ -30,4 +30,5 @@ clamd_la_CPPFLAGS = \
 	-I$(top_builddir)/src/common \
 	-I$(top_srcdir)/src/gtk \
 	$(GLIB_CFLAGS) \
-	$(GTK_CFLAGS)
+	$(GTK_CFLAGS) \
+	$(ENCHANT_CFLAGS)
diff --git a/src/plugins/dillo/Makefile.am b/src/plugins/dillo/Makefile.am
index 9f8f42a..d3453c5 100644
--- a/src/plugins/dillo/Makefile.am
+++ b/src/plugins/dillo/Makefile.am
@@ -32,4 +32,5 @@ dillo_la_CPPFLAGS = \
 	-I$(top_srcdir)/src/common \
 	-I$(top_srcdir)/src/gtk \
 	$(GLIB_CFLAGS) \
-	$(GTK_CFLAGS)
+	$(GTK_CFLAGS) \
+	$(ENCHANT_CFLAGS)
diff --git a/src/plugins/fancy/Makefile.am b/src/plugins/fancy/Makefile.am
index 4c684b3..519b885 100644
--- a/src/plugins/fancy/Makefile.am
+++ b/src/plugins/fancy/Makefile.am
@@ -81,6 +81,7 @@ fancy_la_CPPFLAGS = \
 	$(IFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(GTK_CFLAGS) \
+	$(ENCHANT_CFLAGS) \
 	$(WEBKIT_CFLAGS) \
 	$(LIBSOUP_GNOME_CFLAGS) \
 	$(CURL_CFLAGS)
diff --git a/src/plugins/libravatar/Makefile.am b/src/plugins/libravatar/Makefile.am
index 4fcc57c..ac0f35c 100644
--- a/src/plugins/libravatar/Makefile.am
+++ b/src/plugins/libravatar/Makefile.am
@@ -73,7 +73,8 @@ libravatar_la_CPPFLAGS = \
 	$(IFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(GTK_CFLAGS) \
-	$(CURL_CFLAGS)
+	$(CURL_CFLAGS) \
+	$(ENCHANT_CFLAGS)
 
 libravatar_la_SOURCES = \
 	libravatar.c libravatar.h \
diff --git a/src/plugins/mailmbox/Makefile.am b/src/plugins/mailmbox/Makefile.am
index a0e662c..62acb27 100644
--- a/src/plugins/mailmbox/Makefile.am
+++ b/src/plugins/mailmbox/Makefile.am
@@ -86,4 +86,5 @@ mailmbox_la_LIBADD = \
 mailmbox_la_CPPFLAGS = \
 	$(IFLAGS) \
 	$(GLIB_CFLAGS) \
-	$(GTK_CFLAGS)
+	$(GTK_CFLAGS) \
+	$(ENCHANT_CFLAGS)
diff --git a/src/plugins/managesieve/Makefile.am b/src/plugins/managesieve/Makefile.am
index 2155c44..8a9da5d 100644
--- a/src/plugins/managesieve/Makefile.am
+++ b/src/plugins/managesieve/Makefile.am
@@ -73,6 +73,7 @@ managesieve_la_CPPFLAGS = \
 	$(IFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(GTK_CFLAGS) \
+	$(ENCHANT_CFLAGS) \
 	$(CURL_CFLAGS)
 
 managesieve_la_SOURCES = \
diff --git a/src/plugins/notification/Makefile.am b/src/plugins/notification/Makefile.am
index 1ce0e2c..41800a7 100644
--- a/src/plugins/notification/Makefile.am
+++ b/src/plugins/notification/Makefile.am
@@ -102,6 +102,7 @@ notification_la_CPPFLAGS = \
 	$(NOTIFY_CFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(GTK_CFLAGS) \
+	$(ENCHANT_CFLAGS) \
 	$(libnotify_CFLAGS) \
 	$(unity_CFLAGS) \
 	$(libcanberra_gtk_CFLAGS)
diff --git a/src/plugins/pdf_viewer/Makefile.am b/src/plugins/pdf_viewer/Makefile.am
index 5da7c41..25cabc5 100644
--- a/src/plugins/pdf_viewer/Makefile.am
+++ b/src/plugins/pdf_viewer/Makefile.am
@@ -25,4 +25,5 @@ pdf_viewer_la_CPPFLAGS = \
 	-I$(top_srcdir)/src/gtk \
 	$(GLIB_CFLAGS) \
 	$(GTK_CFLAGS) \
+	$(ENCHANT_CFLAGS) \
 	$(POPPLER_CFLAGS)
diff --git a/src/plugins/perl/Makefile.am b/src/plugins/perl/Makefile.am
index 2785e3f..31f162e 100644
--- a/src/plugins/perl/Makefile.am
+++ b/src/plugins/perl/Makefile.am
@@ -29,6 +29,7 @@ perl_la_CPPFLAGS = \
 	-I$(top_srcdir)/src/gtk \
 	$(GLIB_CFLAGS) \
 	$(GTK_CFLAGS) \
+	$(ENCHANT_CFLAGS) \
 	$(PERL_CFLAGS)
 
 EXTRA_DIST = cm_perl.pod
diff --git a/src/plugins/python/Makefile.am b/src/plugins/python/Makefile.am
index ebb9d72..d8da14a 100644
--- a/src/plugins/python/Makefile.am
+++ b/src/plugins/python/Makefile.am
@@ -49,6 +49,7 @@ python_la_CPPFLAGS = \
 	-I$(top_srcdir)/src/gtk \
 	$(GLIB_CFLAGS) \
 	$(GTK_CFLAGS) \
+	$(ENCHANT_CFLAGS) \
 	$(PYTHON_CFLAGS) \
 	$(PYGTK_CFLAGS) \
 	-DPYTHON_SHARED_LIB="\"$(PYTHON_SHARED_LIB)\"" \
diff --git a/src/plugins/rssyl/Makefile.am b/src/plugins/rssyl/Makefile.am
index 12b663a..6106f39 100644
--- a/src/plugins/rssyl/Makefile.am
+++ b/src/plugins/rssyl/Makefile.am
@@ -76,6 +76,7 @@ rssyl_la_CPPFLAGS = \
 	$(IFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(GTK_CFLAGS) \
+	$(ENCHANT_CFLAGS) \
 	$(CURL_CFLAGS) \
 	$(EXPAT_CFLAGS)
 
diff --git a/src/plugins/spam_report/Makefile.am b/src/plugins/spam_report/Makefile.am
index 15323d3..43ba72e 100644
--- a/src/plugins/spam_report/Makefile.am
+++ b/src/plugins/spam_report/Makefile.am
@@ -78,4 +78,5 @@ spamreport_la_CPPFLAGS = \
 	$(IFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(CURL_CFLAGS) \
-	$(GTK_CFLAGS)
+	$(GTK_CFLAGS) \
+	$(ENCHANT_CFLAGS)
diff --git a/src/plugins/vcalendar/Makefile.am b/src/plugins/vcalendar/Makefile.am
index ceb18d1..a44367e 100644
--- a/src/plugins/vcalendar/Makefile.am
+++ b/src/plugins/vcalendar/Makefile.am
@@ -89,6 +89,7 @@ vcalendar_la_CPPFLAGS = \
 	$(IFLAGS) \
 	$(GLIB_CFLAGS) \
 	$(GTK_CFLAGS) \
+	$(ENCHANT_CFLAGS) \
 	$(CURL_CFLAGS) \
   $(LIBICAL_CFLAGS)
 

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail

More information about the Commits mailing list