[Commits] configure.ac 1.654.2.4659 1.654.2.4660 PATCHSETS 1.1.2.4591 1.1.2.4592 ChangeLog 1.396.2.3763 1.396.2.3764

colin at claws-mail.org colin at claws-mail.org
Wed Feb 20 09:46:00 CET 2013 

Update of /home/claws-mail/claws
In directory srv:/tmp/cvs-serv23253

Modified Files:
      Tag: gtk2
	configure.ac PATCHSETS ChangeLog 
Log Message:
2013-02-20 [colin]	3.9.0cvs83

	* configure.ac
	* src/plugins/Makefile.am
	* src/plugins/spam_report/.cvsignore
	* src/plugins/spam_report/Makefile.am
	* src/plugins/spam_report/placeholder.txt
	* src/plugins/spam_report/spam_report.c
	* src/plugins/spam_report/spam_report_prefs.c
	* src/plugins/spam_report/spam_report_prefs.h
	* src/plugins/tnef_parse/.cvsignore
	* src/plugins/tnef_parse/Makefile.am
	* src/plugins/tnef_parse/claws.def
	* src/plugins/tnef_parse/mapi.h
	* src/plugins/tnef_parse/mapidefs.h
	* src/plugins/tnef_parse/mapitags.h
	* src/plugins/tnef_parse/placeholder.txt
	* src/plugins/tnef_parse/plugin.def
	* src/plugins/tnef_parse/tnef-errors.h
	* src/plugins/tnef_parse/tnef-types.h
	* src/plugins/tnef_parse/tnef_dump.c
	* src/plugins/tnef_parse/tnef_dump.h
	* src/plugins/tnef_parse/tnef_parse.c
	* src/plugins/tnef_parse/version.rc
	* src/plugins/tnef_parse/ytnef.c
	* src/plugins/tnef_parse/ytnef.h
		Add tnef_parse and spam_report

Index: configure.ac
===================================================================
RCS file: /home/claws-mail/claws/configure.ac,v
retrieving revision 1.654.2.4659
retrieving revision 1.654.2.4660
diff -u -d -r1.654.2.4659 -r1.654.2.4660
--- configure.ac	20 Feb 2013 08:16:13 -0000	1.654.2.4659
+++ configure.ac	20 Feb 2013 08:45:56 -0000	1.654.2.4660
@@ -12,7 +12,7 @@
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=82
+EXTRA_VERSION=83
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
@@ -853,7 +853,7 @@
 PLUGINS=""
 
 dnl Find curl-config, used by fancy, vcalendar
-PKG_CHECK_MODULES(CURL, libcurl)
+PKG_CHECK_MODULES(CURL, libcurl, [have_curl=yes], [have_curl=no])
 AC_SUBST(CURL_LIBS)
 AC_SUBST(CURL_CFLAGS)
 
@@ -1334,6 +1334,7 @@
 	AC_MSG_RESULT(no)
 fi
 AM_CONDITIONAL(BUILD_SMIME_PLUGIN, test x"$ac_cv_enable_smime_plugin" = xyes)
+
 dnl --- SpamAssassin ---
 AC_MSG_CHECKING([whether to build SpamAssassin plugin])
 AC_ARG_ENABLE(spamassassin-plugin,
@@ -1349,6 +1350,36 @@
 fi
 AM_CONDITIONAL(BUILD_SPAMASSASSIN_PLUGIN, test x"$ac_cv_enable_spamassassin_plugin" = xyes)
 
+dnl --- spam_report ---
+AC_MSG_CHECKING([whether to build spam_report plugin])
+AC_ARG_ENABLE(spam_report-plugin,
+	[  --disable-spam_report-plugin      do not build spam_report plugin],
+	[ac_cv_enable_spam_report_plugin=$enableval], [ac_cv_enable_spam_report_plugin=yes])
+if test x"$ac_cv_enable_spam_report_plugin" = xyes; then
+	if test x"$have_curl" = xyes; then
+		AC_MSG_RESULT(yes)
+		PLUGINS="spam_report $PLUGINS"
+	else
+		AC_MSG_ERROR(spam_report needs libcurl)
+	fi
+else
+	AC_MSG_RESULT(no)
+fi
+AM_CONDITIONAL(BUILD_SPAM_REPORT_PLUGIN, test x"$ac_cv_enable_spam_report_plugin" = xyes)
+
+dnl --- tnef_parse ---
+AC_MSG_CHECKING([whether to build tnef_parse plugin])
+AC_ARG_ENABLE(tnef_parse-plugin,
+	[  --disable-tnef_parse-plugin      do not build tnef_parse plugin],
+	[ac_cv_enable_tnef_parse_plugin=$enableval], [ac_cv_enable_tnef_parse_plugin=yes])
+if test x"$ac_cv_enable_tnef_parse_plugin" = xyes; then
+	AC_MSG_RESULT(yes)
+	PLUGINS="tnef_parse $PLUGINS"
+else
+	AC_MSG_RESULT(no)
+fi
+AM_CONDITIONAL(BUILD_TNEF_PARSE_PLUGIN, test x"$ac_cv_enable_tnef_parse_plugin" = xyes)
+
 dnl --- Trayicon ---
 AC_MSG_CHECKING([whether to build Trayicon plugin])
 AC_ARG_ENABLE(trayicon-plugin,
@@ -1484,6 +1515,8 @@
 src/plugins/rssyl/Makefile
 src/plugins/smime/Makefile
 src/plugins/spamassassin/Makefile
+src/plugins/spam_report/Makefile
+src/plugins/tnef_parse/Makefile
 src/plugins/trayicon/Makefile
 src/plugins/vcalendar/Makefile
 src/plugins/vcalendar/libical/Makefile

Index: PATCHSETS
===================================================================
RCS file: /home/claws-mail/claws/PATCHSETS,v
retrieving revision 1.1.2.4591
retrieving revision 1.1.2.4592
diff -u -d -r1.1.2.4591 -r1.1.2.4592
--- PATCHSETS	20 Feb 2013 08:16:12 -0000	1.1.2.4591
+++ PATCHSETS	20 Feb 2013 08:45:57 -0000	1.1.2.4592
@@ -4580,3 +4580,4 @@
 ( cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/notification/Makefile.am;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/pdf_viewer/Makefile.am;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/python/Makefile.am;  ) > 3.9.0cvs80.patchset
 ( cvs diff -u -r 1.654.2.4657 -r 1.654.2.4658 configure.ac;  ) > 3.9.0cvs81.patchset
 ( cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/plugins/bogofilter/Makefile.am;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/clamd/Makefile.am;  cvs diff -u -r 1.3.2.4 -r 1.3.2.5 src/plugins/demo/Makefile.am;  cvs diff -u -r 1.4.2.9 -r 1.4.2.10 src/plugins/dillo_viewer/Makefile.am;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/fancy/Makefile.am;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/fetchinfo/Makefile.am;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/gdata/Makefile.am;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/mailmbox/Makefile.am;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/newmail/Makefile.am;  cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/plugins/notification/Makefile.am;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/pdf_viewer/Makefile.am;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/perl/Makefile.am;  cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/python/Makefile.am;  cvs diff -u -r 1.5.2.10 -r 1.5.2.11 src/plugins/spamassassin/Makefile.am;  cvs diff -u -r 1.4.2.14 -r 1.4.2.15 src/plugins/trayicon/Makefile.am;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/plugins/vcalendar/libical/libical/Makefile.am;  ) > 3.9.0cvs82.patchset
+( cvs diff -u -r 1.654.2.4659 -r 1.654.2.4660 configure.ac;  cvs diff -u -r 1.8.2.14 -r 1.8.2.15 src/plugins/Makefile.am;  diff -u /dev/null src/plugins/spam_report/.cvsignore;  diff -u /dev/null src/plugins/spam_report/Makefile.am;  cvs diff -u -r -1.1.2.1 -r -1.1.2.2 src/plugins/spam_report/placeholder.txt;  diff -u /dev/null src/plugins/spam_report/spam_report.c;  diff -u /dev/null src/plugins/spam_report/spam_report_prefs.c;  diff -u /dev/null src/plugins/spam_report/spam_report_prefs.h;  diff -u /dev/null src/plugins/tnef_parse/.cvsignore;  diff -u /dev/null src/plugins/tnef_parse/Makefile.am;  diff -u /dev/null src/plugins/tnef_parse/claws.def;  diff -u /dev/null src/plugins/tnef_parse/mapi.h;  diff -u /dev/null src/plugins/tnef_parse/mapidefs.h;  diff -u /dev/null src/plugins/tnef_parse/mapitags.h;  cvs diff -u -r -1.1.2.1 -r -1.1.2.2 src/plugins/tnef_parse/placeholder.txt;  diff -u /dev/null src/plugins/tnef_parse/plugin.def;  diff -u /dev/null src/plugins/tnef_parse/tnef-errors.h;  diff -u /dev/null src/plugins/tnef_parse/tnef-types.h;  diff -u /dev/null src/plugins/tnef_parse/tnef_dump.c;  diff -u /dev/null src/plugins/tnef_parse/tnef_dump.h;  diff -u /dev/null src/plugins/tnef_parse/tnef_parse.c;  diff -u /dev/null src/plugins/tnef_parse/version.rc;  diff -u /dev/null src/plugins/tnef_parse/ytnef.c;  diff -u /dev/null src/plugins/tnef_parse/ytnef.h;  ) > 3.9.0cvs83.patchset

Index: ChangeLog
===================================================================
RCS file: /home/claws-mail/claws/ChangeLog,v
retrieving revision 1.396.2.3763
retrieving revision 1.396.2.3764
diff -u -d -r1.396.2.3763 -r1.396.2.3764
--- ChangeLog	20 Feb 2013 08:16:13 -0000	1.396.2.3763
+++ ChangeLog	20 Feb 2013 08:45:57 -0000	1.396.2.3764
@@ -1,3 +1,31 @@
+2013-02-20 [colin]	3.9.0cvs83
+
+	* configure.ac
+	* src/plugins/Makefile.am
+	* src/plugins/spam_report/.cvsignore
+	* src/plugins/spam_report/Makefile.am
+	* src/plugins/spam_report/placeholder.txt
+	* src/plugins/spam_report/spam_report.c
+	* src/plugins/spam_report/spam_report_prefs.c
+	* src/plugins/spam_report/spam_report_prefs.h
+	* src/plugins/tnef_parse/.cvsignore
+	* src/plugins/tnef_parse/Makefile.am
+	* src/plugins/tnef_parse/claws.def
+	* src/plugins/tnef_parse/mapi.h
+	* src/plugins/tnef_parse/mapidefs.h
+	* src/plugins/tnef_parse/mapitags.h
+	* src/plugins/tnef_parse/placeholder.txt
+	* src/plugins/tnef_parse/plugin.def
+	* src/plugins/tnef_parse/tnef-errors.h
+	* src/plugins/tnef_parse/tnef-types.h
+	* src/plugins/tnef_parse/tnef_dump.c
+	* src/plugins/tnef_parse/tnef_dump.h
+	* src/plugins/tnef_parse/tnef_parse.c
+	* src/plugins/tnef_parse/version.rc
+	* src/plugins/tnef_parse/ytnef.c
+	* src/plugins/tnef_parse/ytnef.h
+		Add tnef_parse and spam_report
+
 2013-02-20 [colin]	3.9.0cvs82
 
 	* src/plugins/bogofilter/Makefile.am

More information about the Commits mailing list