[Commits] ChangeLog 1.396.2.3742 1.396.2.3743 PATCHSETS 1.1.2.4570 1.1.2.4571 configure.ac 1.654.2.4638 1.654.2.4639

claws at claws-mail.org claws at claws-mail.org
Wed Feb 13 17:23:38 CET 2013 

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

Modified Files:
      Tag: gtk2
	ChangeLog PATCHSETS configure.ac 
Log Message:
2013-02-13 [paul]	3.9.0cvs62

	* configure.ac
	* po/POTFILES.in
	* src/plugins/Makefile.am
	* src/plugins/fancy/Makefile.am
	* src/plugins/fancy/fancy_prefs.c
	* src/plugins/fancy/fancy_prefs.h
	* src/plugins/fancy/fancy_viewer.c
	* src/plugins/fancy/fancy_viewer.h
		move the Fancy plugin into core 

Index: configure.ac
===================================================================
RCS file: /home/claws-mail/claws/configure.ac,v
retrieving revision 1.654.2.4638
retrieving revision 1.654.2.4639
diff -u -d -r1.654.2.4638 -r1.654.2.4639
--- configure.ac	11 Feb 2013 12:28:12 -0000	1.654.2.4638
+++ configure.ac	13 Feb 2013 16:23:36 -0000	1.654.2.4639
@@ -12,7 +12,7 @@
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=61
+EXTRA_VERSION=62
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
@@ -983,6 +983,51 @@
 fi
 AM_CONDITIONAL(BUILD_DILLO_VIEWER_PLUGIN, test x"$ac_cv_enable_dillo_viewer_plugin" = xyes)
 
+
+dnl --- Fancy ---
+AC_MSG_CHECKING([whether to build Fancy plugin])
+AC_ARG_ENABLE(fancy-plugin,
+	[  --disable-fancy-plugin     do not build Fancy plugin for html mail rendering],
+	[ac_cv_enable_fancy_plugin=$enableval], [ac_cv_enable_fancy_plugin=yes])
+if test x"$ac_cv_enable_fancy_plugin" = xyes; then
+	AC_MSG_RESULT(yes)
+	dnl Check for WebKit
+	PKG_CHECK_MODULES(WEBKIT, webkit-1.0,
+		[ 
+			PLUGINS="fancy $PLUGINS"
+		],
+		[
+			echo "webkit-1.0 not found."
+			ac_cv_enable_fancy_plugin=no
+		])
+		AC_SUBST(WEBKIT_LIBS)
+		AC_SUBST(WEBKIT_CFLAGS)
+fi
+if test x"$ac_cv_enable_fancy_plugin" = xyes; then
+	dnl Check for libsoup-gnome
+	PKG_CHECK_MODULES(LIBSOUP_GNOME, libsoup-gnome-2.4 >= 2.26, ac_cv_enable_soup_gnome=yes, ac_cv_enable_soup_gnome=no)        
+	if test x$ac_cv_enable_soup_gnome = xyes; then
+			AC_DEFINE(HAVE_LIBSOUP_GNOME, 1, Define if you want soup gnome proxy support)
+	fi
+	AC_SUBST(LIBSOUP_GNOME_CFLAGS)
+	AC_SUBST(LIBSOUP_GNOME_LIBS)
+	
+	dnl Find curl-config
+	PKG_CHECK_MODULES(CURL, libcurl)
+	AC_SUBST(CURL_LIBS)
+	AC_SUBST(CURL_CFLAGS)
+	
+	PKG_CHECK_MODULES(GTKPRINTUNIX, gtk+-unix-print-2.0, ac_cv_enable_gtkprint=yes, ac_cv_enable_gtkprint=no)        
+	if test x$ac_cv_enable_gtkprint = xyes; then
+		AC_DEFINE(USE_PRINTUNIX, 1, Define if you want gtk+-unix-print support)
+	else
+		AC_MSG_RESULT(not found)
+	fi
+	AC_SUBST(GTKPRINTUNIX_CFLAGS)
+	AC_SUBST(GTKPRINTUNIX_LIBS)
+fi
+AM_CONDITIONAL(BUILD_FANCY_PLUGIN, test x"$ac_cv_enable_fancy_plugin" = xyes)
+
 dnl --- Demo ---
 AC_ARG_ENABLE(demo-plugin,
 	[  --enable-demo-plugin              build demo plugin],
@@ -991,7 +1036,7 @@
 	PLUGINS="demo $PLUGINS"
 fi
 AM_CONDITIONAL(BUILD_DEMO_PLUGIN, test x"$ac_cv_enable_demo_plugin" = xyes)
-
+	
 dnl Libetpan
 AC_MSG_CHECKING([whether to use libetpan])
 AC_ARG_ENABLE(libetpan,
@@ -1074,6 +1119,7 @@
 src/plugins/bogofilter/Makefile
 src/plugins/spamassassin/Makefile
 src/plugins/dillo_viewer/Makefile
+src/plugins/fancy/Makefile
 src/plugins/trayicon/Makefile
 src/plugins/pgpcore/Makefile
 src/plugins/pgpmime/Makefile

Index: PATCHSETS
===================================================================
RCS file: /home/claws-mail/claws/PATCHSETS,v
retrieving revision 1.1.2.4570
retrieving revision 1.1.2.4571
diff -u -d -r1.1.2.4570 -r1.1.2.4571
--- PATCHSETS	11 Feb 2013 12:28:12 -0000	1.1.2.4570
+++ PATCHSETS	13 Feb 2013 16:23:35 -0000	1.1.2.4571
@@ -4559,3 +4559,4 @@
 ( cvs diff -u -r 1.12.2.80 -r 1.12.2.81 src/action.c;  cvs diff -u -r 1.36.2.212 -r 1.36.2.213 src/common/utils.c;  ) > 3.9.0cvs59.patchset
 ( cvs diff -u -r 1.1.4.7 -r 1.1.4.8 tools/vcard2xml.py;  ) > 3.9.0cvs60.patchset
 ( cvs diff -u -r 1.274.2.364 -r 1.274.2.365 src/mainwindow.c;  ) > 3.9.0cvs61.patchset
+( cvs diff -u -r 1.654.2.4638 -r 1.654.2.4639 configure.ac;  cvs diff -u -r 1.53.2.39 -r 1.53.2.40 po/POTFILES.in;  cvs diff -u -r 1.8.2.8 -r 1.8.2.9 src/plugins/Makefile.am;  diff -u /dev/null src/plugins/fancy/Makefile.am;  diff -u /dev/null src/plugins/fancy/fancy_prefs.c;  diff -u /dev/null src/plugins/fancy/fancy_prefs.h;  diff -u /dev/null src/plugins/fancy/fancy_viewer.c;  diff -u /dev/null src/plugins/fancy/fancy_viewer.h;  ) > 3.9.0cvs62.patchset

Index: ChangeLog
===================================================================
RCS file: /home/claws-mail/claws/ChangeLog,v
retrieving revision 1.396.2.3742
retrieving revision 1.396.2.3743
diff -u -d -r1.396.2.3742 -r1.396.2.3743
--- ChangeLog	11 Feb 2013 12:28:10 -0000	1.396.2.3742
+++ ChangeLog	13 Feb 2013 16:23:35 -0000	1.396.2.3743
@@ -1,3 +1,15 @@
+2013-02-13 [paul]	3.9.0cvs62
+
+	* configure.ac
+	* po/POTFILES.in
+	* src/plugins/Makefile.am
+	* src/plugins/fancy/Makefile.am
+	* src/plugins/fancy/fancy_prefs.c
+	* src/plugins/fancy/fancy_prefs.h
+	* src/plugins/fancy/fancy_viewer.c
+	* src/plugins/fancy/fancy_viewer.h
+		move the Fancy plugin into core
+
 2013-02-11 [paul]	3.9.0cvs61
 
 	* src/mainwindow.c

More information about the Commits mailing list