[Commits] [SCM] claws branch, 3.15.0-cherrypick, updated. 3.15.0-16-gca2e163

[claws at claws-mail.org]

The branch, 3.15.0-cherrypick has been updated
       via  ca2e1632ff335c82dff2cb8ecc2b5aa2b2e92e89 (commit)
       via  b8b9cad77351c10880401b8df1cff3af00c71582 (commit)
      from  4b299c6b80302b1009e4196ccb628133204c6311 (commit)

Summary of changes:
 RELEASE_NOTES           |    2 +-
 configure.ac            |   25 ++++++++++++-------------
 src/plugins/Makefile.am |    1 -
 3 files changed, 13 insertions(+), 15 deletions(-)


- Log -----------------------------------------------------------------
commit ca2e1632ff335c82dff2cb8ecc2b5aa2b2e92e89
Author: Paul <paul at claws-mail.org>
Date:   Tue Aug 29 20:33:40 2017 +0100

    no dillo plugin in release

diff --git a/configure.ac b/configure.ac
index 8547307..a54710b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1010,9 +1010,9 @@ AC_ARG_ENABLE(clamd-plugin,
 		[  --disable-clamd-plugin          Do not build clamd plugin],
 		[enable_clamd_plugin=$enableval], [enable_clamd_plugin=auto])
 
-AC_ARG_ENABLE(dillo-plugin,
-		[  --disable-dillo-plugin          Do not build dillo plugin],
-		[enable_dillo_plugin=$enableval], [enable_dillo_plugin=auto])
+dnl AC_ARG_ENABLE(dillo-plugin,
+dnl 		[  --disable-dillo-plugin          Do not build dillo plugin],
+dnl 		[enable_dillo_plugin=$enableval], [enable_dillo_plugin=auto])
 
 AC_ARG_ENABLE(fancy-plugin,
 		[  --disable-fancy-plugin          Do not build fancy plugin],
@@ -1488,14 +1488,14 @@ else
 	AC_MSG_RESULT(no)
 fi
 
-AC_MSG_CHECKING([whether to build Dillo plugin])
-if test x"$enable_dillo_plugin" != xno; then
-	PLUGINS="$PLUGINS dillo"
-	AC_MSG_RESULT(yes)
-else
-	DISABLED_PLUGINS="$DISABLED_PLUGINS dillo"
-	AC_MSG_RESULT(no)
-fi
+dnl AC_MSG_CHECKING([whether to build Dillo plugin])
+dnl if test x"$enable_dillo_plugin" != xno; then
+dnl 	PLUGINS="$PLUGINS dillo"
+dnl 	AC_MSG_RESULT(yes)
+dnl else
+dnl 	DISABLED_PLUGINS="$DISABLED_PLUGINS dillo"
+dnl 	AC_MSG_RESULT(no)
+dnl fi
 
 AC_MSG_CHECKING([whether to build fancy plugin])
 if test x"$enable_fancy_plugin" != xno; then
@@ -1970,7 +1970,7 @@ AM_CONDITIONAL(BUILD_BOGOFILTER_PLUGIN,		test x"$enable_bogofilter_plugin" != xn
 AM_CONDITIONAL(BUILD_BSFILTER_PLUGIN,		test x"$enable_bsfilter_plugin" != xno)
 AM_CONDITIONAL(BUILD_CLAMD_PLUGIN,		test x"$enable_clamd_plugin" != xno)
 AM_CONDITIONAL(BUILD_DEMO_PLUGIN,		test x"$enable_demo_plugin" != xno)
-AM_CONDITIONAL(BUILD_DILLO_PLUGIN,		test x"$enable_dillo_plugin" != xno)
+dnl AM_CONDITIONAL(BUILD_DILLO_PLUGIN,		test x"$enable_dillo_plugin" != xno)
 AM_CONDITIONAL(BUILD_FANCY_PLUGIN,		test x"$enable_fancy_plugin" != xno)
 AM_CONDITIONAL(BUILD_FETCHINFO_PLUGIN,		test x"$enable_fetchinfo_plugin" != xno)
 AM_CONDITIONAL(BUILD_GDATA_PLUGIN,		test x"$enable_gdata_plugin" != xno)
@@ -2019,7 +2019,6 @@ src/plugins/bsfilter/Makefile
 src/plugins/clamd/Makefile
 src/plugins/clamd/libclamd/Makefile
 src/plugins/demo/Makefile
-src/plugins/dillo/Makefile
 src/plugins/fancy/Makefile
 src/plugins/fetchinfo/Makefile
 src/plugins/gdata/Makefile
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index 28abfdb..6acc1fb 100644
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -13,7 +13,6 @@ SUBDIRS = \
 	bsfilter \
 	clamd \
 	demo \
-	dillo \
 	fancy \
 	fetchinfo \
 	gdata \

commit b8b9cad77351c10880401b8df1cff3af00c71582
Author: Paul <paul at claws-mail.org>
Date:   Tue Aug 29 20:30:56 2017 +0100

    update release date

diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index e4403a7..9cb937b 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -1,4 +1,4 @@
-28th August 2017                                    Claws Mail 3.15.1
+29th August 2017                                    Claws Mail 3.15.1
 
 		    CLAWS MAIL  RELEASE NOTES
                     http://www.claws-mail.org

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


hooks/post-receive
-- 
Claws Mail