[Commits] [SCM] claws branch, master, updated. 3.17.0-18-g4bed28b

ticho at claws-mail.org ticho at claws-mail.org
Fri Aug 24 14:23:57 CEST 2018 

The branch, master has been updated
       via  4bed28b4a0d0e71e74b53b2c443683a2b2bc5d38 (commit)
       via  f2f20fc45d81f91fbcab14e79d69d509ada694b2 (commit)
      from  5783d2a913dfd980d77c0be13557a54ad5c75e6a (commit)

Summary of changes:
 configure.ac                           |    7 ++++++-
 src/plugins/archive/Makefile.am        |    2 +-
 src/plugins/bogofilter/Makefile.am     |    2 +-
 src/plugins/bsfilter/Makefile.am       |    2 +-
 src/plugins/clamd/Makefile.am          |    2 +-
 src/plugins/clamd/libclamd/Makefile.am |    7 ++++---
 src/plugins/dillo/Makefile.am          |    2 +-
 src/plugins/fancy/Makefile.am          |    2 +-
 src/plugins/fancy/fancy_prefs.c        |    2 +-
 src/plugins/mailmbox/Makefile.am       |    2 +-
 src/plugins/notification/Makefile.am   |    2 +-
 src/plugins/perl/Makefile.am           |    2 +-
 src/plugins/python/Makefile.am         |    2 +-
 src/plugins/rssyl/Makefile.am          |    2 +-
 src/plugins/spam_report/Makefile.am    |    2 +-
 src/plugins/spamassassin/Makefile.am   |    2 +-
 src/plugins/tnef_parse/Makefile.am     |    2 +-
 17 files changed, 25 insertions(+), 19 deletions(-)


- Log -----------------------------------------------------------------
commit 4bed28b4a0d0e71e74b53b2c443683a2b2bc5d38
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Fri Aug 24 14:09:12 2018 +0200

    Fix various plugins including generated .h files when building outside of source dir.

diff --git a/src/plugins/archive/Makefile.am b/src/plugins/archive/Makefile.am
index ec5594f..c3cb051 100644
--- a/src/plugins/archive/Makefile.am
+++ b/src/plugins/archive/Makefile.am
@@ -30,7 +30,7 @@ archive_la_LIBADD = \
 archive_la_CPPFLAGS = \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/src/common \
-	-I$(top_builddir)/src/common \
+	-I$(top_builddir)/src \
 	-I$(top_srcdir)/src/gtk \
 	$(GLIB_CFLAGS) \
 	$(GTK_CFLAGS) \
diff --git a/src/plugins/bogofilter/Makefile.am b/src/plugins/bogofilter/Makefile.am
index fd41b2c..acb5f4e 100644
--- a/src/plugins/bogofilter/Makefile.am
+++ b/src/plugins/bogofilter/Makefile.am
@@ -27,7 +27,7 @@ bogofilter_la_LIBADD = $(cygwin_export_lib) \
 bogofilter_la_CPPFLAGS = \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/src/common \
-	-I$(top_builddir)/src/common \
+	-I$(top_builddir)/src \
 	-I$(top_srcdir)/src/gtk \
 	$(ENCHANT_CFLAGS) \
 	$(GLIB_CFLAGS) \
diff --git a/src/plugins/bsfilter/Makefile.am b/src/plugins/bsfilter/Makefile.am
index 0b92019..72bee25 100644
--- a/src/plugins/bsfilter/Makefile.am
+++ b/src/plugins/bsfilter/Makefile.am
@@ -8,7 +8,7 @@ EXTRA_DIST = claws.def plugin.def version.rc
 IFLAGS = \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/src/common \
-	-I$(top_builddir)/src/common \
+	-I$(top_builddir)/src \
 	-I$(top_srcdir)/src/gtk
 
 if OS_WIN32
diff --git a/src/plugins/clamd/Makefile.am b/src/plugins/clamd/Makefile.am
index 8099afb..a66e992 100644
--- a/src/plugins/clamd/Makefile.am
+++ b/src/plugins/clamd/Makefile.am
@@ -27,7 +27,7 @@ clamd_la_CPPFLAGS = \
 	-I$(top_srcdir)/src/plugins/clamd/libclamd \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/src/common \
-	-I$(top_builddir)/src/common \
+	-I$(top_builddir)/src \
 	-I$(top_srcdir)/src/gtk \
 	$(GLIB_CFLAGS) \
 	$(GTK_CFLAGS) \
diff --git a/src/plugins/clamd/libclamd/Makefile.am b/src/plugins/clamd/libclamd/Makefile.am
index f1f9f34..a71ac3e 100644
--- a/src/plugins/clamd/libclamd/Makefile.am
+++ b/src/plugins/clamd/libclamd/Makefile.am
@@ -8,9 +8,10 @@ libclamd_plugin_la_CPPFLAGS = \
 	$(GTK_CFLAGS) \
 	-I$(top_srcdir) \
 	-I$(top_builddir) \
-        -I$(top_srcdir)/src \
-        -I$(top_srcdir)/src/common \
-        -I$(top_srcdir)/src/gtk
+	-I$(top_builddir)/src \
+	-I$(top_srcdir)/src \
+	-I$(top_srcdir)/src/common \
+	-I$(top_srcdir)/src/gtk
 
 if BUILD_CLAMD_PLUGIN
 noinst_LTLIBRARIES = libclamd-plugin.la
diff --git a/src/plugins/dillo/Makefile.am b/src/plugins/dillo/Makefile.am
index d3453c5..5c15449 100644
--- a/src/plugins/dillo/Makefile.am
+++ b/src/plugins/dillo/Makefile.am
@@ -28,7 +28,7 @@ dillo_la_LIBADD = $(cygwin_export_lib) \
 
 dillo_la_CPPFLAGS = \
 	-I$(top_srcdir)/src \
-	-I$(top_builddir)/src/common \
+	-I$(top_builddir)/src \
 	-I$(top_srcdir)/src/common \
 	-I$(top_srcdir)/src/gtk \
 	$(GLIB_CFLAGS) \
diff --git a/src/plugins/fancy/Makefile.am b/src/plugins/fancy/Makefile.am
index 519b885..bfd1dd0 100644
--- a/src/plugins/fancy/Makefile.am
+++ b/src/plugins/fancy/Makefile.am
@@ -8,7 +8,7 @@ EXTRA_DIST = claws.def plugin.def version.rc
 IFLAGS = \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/src/common \
-	-I$(top_builddir)/src/common \
+	-I$(top_builddir)/src \
 	-I$(top_srcdir)/src/gtk
 
 if OS_WIN32
diff --git a/src/plugins/fancy/fancy_prefs.c b/src/plugins/fancy/fancy_prefs.c
index 111706e..6e930e1 100644
--- a/src/plugins/fancy/fancy_prefs.c
+++ b/src/plugins/fancy/fancy_prefs.c
@@ -25,8 +25,8 @@
 #include <glib.h>
 #include <glib/gi18n.h>
 
+#include "common/version.h"
 #include "defs.h"
-#include "version.h"
 #include "claws.h"
 #include "plugin.h"
 #include "gtkutils.h"
diff --git a/src/plugins/mailmbox/Makefile.am b/src/plugins/mailmbox/Makefile.am
index 62acb27..1eceab5 100644
--- a/src/plugins/mailmbox/Makefile.am
+++ b/src/plugins/mailmbox/Makefile.am
@@ -8,7 +8,7 @@ EXTRA_DIST = claws.def plugin.def version.rc
 IFLAGS = \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/src/common \
-	-I$(top_builddir)/src/common \
+	-I$(top_builddir)/src \
 	-I$(top_srcdir)/src/gtk
 
 if OS_WIN32
diff --git a/src/plugins/notification/Makefile.am b/src/plugins/notification/Makefile.am
index 41800a7..35c2f1c 100644
--- a/src/plugins/notification/Makefile.am
+++ b/src/plugins/notification/Makefile.am
@@ -19,7 +19,7 @@ IFLAGS = \
 	-I$(top_srcdir)/src/plugins/notification/gtkhotkey \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/src/common \
-	-I$(top_builddir)/src/common \
+	-I$(top_builddir)/src \
 	-I$(top_srcdir)/src/gtk
 
 if OS_WIN32
diff --git a/src/plugins/perl/Makefile.am b/src/plugins/perl/Makefile.am
index 31f162e..3df58c3 100644
--- a/src/plugins/perl/Makefile.am
+++ b/src/plugins/perl/Makefile.am
@@ -25,7 +25,7 @@ perl_la_LIBADD = \
 perl_la_CPPFLAGS = \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/src/common \
-	-I$(top_builddir)/src/common \
+	-I$(top_builddir)/src \
 	-I$(top_srcdir)/src/gtk \
 	$(GLIB_CFLAGS) \
 	$(GTK_CFLAGS) \
diff --git a/src/plugins/python/Makefile.am b/src/plugins/python/Makefile.am
index d8da14a..fe7592e 100644
--- a/src/plugins/python/Makefile.am
+++ b/src/plugins/python/Makefile.am
@@ -45,7 +45,7 @@ python_la_LDFLAGS = \
 python_la_CPPFLAGS = \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/src/common \
-	-I$(top_builddir)/src/common \
+	-I$(top_builddir)/src \
 	-I$(top_srcdir)/src/gtk \
 	$(GLIB_CFLAGS) \
 	$(GTK_CFLAGS) \
diff --git a/src/plugins/rssyl/Makefile.am b/src/plugins/rssyl/Makefile.am
index 6106f39..29209b2 100644
--- a/src/plugins/rssyl/Makefile.am
+++ b/src/plugins/rssyl/Makefile.am
@@ -10,7 +10,7 @@ EXTRA_DIST = claws.def plugin.def version.rc
 IFLAGS = \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/src/common \
-	-I$(top_builddir)/src/common \
+	-I$(top_builddir)/src \
 	-I$(top_srcdir)/src/gtk
 
 if OS_WIN32
diff --git a/src/plugins/spam_report/Makefile.am b/src/plugins/spam_report/Makefile.am
index 43ba72e..5a077dd 100644
--- a/src/plugins/spam_report/Makefile.am
+++ b/src/plugins/spam_report/Makefile.am
@@ -8,7 +8,7 @@ EXTRA_DIST = claws.def plugin.def version.rc
 IFLAGS = \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/src/common \
-	-I$(top_builddir)/src/common \
+	-I$(top_builddir)/src \
 	-I$(top_srcdir)/src/gtk
 
 if OS_WIN32
diff --git a/src/plugins/spamassassin/Makefile.am b/src/plugins/spamassassin/Makefile.am
index 71e6c06..98e3518 100644
--- a/src/plugins/spamassassin/Makefile.am
+++ b/src/plugins/spamassassin/Makefile.am
@@ -30,7 +30,7 @@ spamassassin_la_LIBADD = $(cygwin_export_lib) \
 spamassassin_la_CPPFLAGS = \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/src/common \
-	-I$(top_builddir)/src/common \
+	-I$(top_builddir)/src \
 	-I$(top_srcdir)/src/gtk \
 	$(ENCHANT_CFLAGS) \
 	$(GLIB_CFLAGS) \
diff --git a/src/plugins/tnef_parse/Makefile.am b/src/plugins/tnef_parse/Makefile.am
index cf599ae..3dfe9c8 100644
--- a/src/plugins/tnef_parse/Makefile.am
+++ b/src/plugins/tnef_parse/Makefile.am
@@ -71,7 +71,7 @@ tnef_parse_la_LIBADD = $(plugin_ldadd) $(cygwin_export_lib) \
 IFLAGS = \
 	-I$(top_srcdir)/src \
 	-I$(top_srcdir)/src/common \
-	-I$(top_builddir)/src/common \
+	-I$(top_builddir)/src \
 	-I$(top_srcdir)/src/gtk
 
 tnef_parse_la_CPPFLAGS = \

commit f2f20fc45d81f91fbcab14e79d69d509ada694b2
Author: Andrej Kacian <ticho at claws-mail.org>
Date:   Fri Aug 24 13:48:38 2018 +0200

    Fix configure version detection when building outside of srcdir.

diff --git a/configure.ac b/configure.ac
index 35e3b13..a3d2a67 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,8 +21,13 @@ if test \( -d .git \); then
 	echo "echo ${GIT_VERSION}" > ./version
     fi
 else
-    GIT_VERSION=`sh -c ". ./$srcdir/version"`
+    GIT_VERSION=`sh -c ". $srcdir/version"`
 fi
+
+if test \( -z "$GIT_VERSION" \); then
+	AC_MSG_ERROR([*** could not determine program version])
+fi
+
 MAJOR_VERSION=${GIT_VERSION%%.*}
 MINOR_VERSION=${GIT_VERSION#*.}
 MINOR_VERSION=${MINOR_VERSION%%.*}

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


hooks/post-receive
-- 
Claws Mail

More information about the Commits mailing list