From 7de0eda5d3dcd6400005910b936824650c4f7c18 Mon Sep 17 00:00:00 2001
From: Christoph Hohmann <reboot@gmx.ch>
Date: Fri, 1 Aug 2003 21:16:34 +0000
Subject: [PATCH] 0.9.3claws89

* configure.ac
        o try to build all plugins (except spamassassin) by default
        o don't build a plugin if a dependency check fails

* src/common/hooks.c
        fix warning
---
 ChangeLog.claws    | 11 ++++++++++-
 configure.ac       | 20 ++++++++++++--------
 src/common/hooks.c |  2 +-
 3 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/ChangeLog.claws b/ChangeLog.claws
index a265534a8..576bb6f4f 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,4 +1,13 @@
-2003-08-01 [christoph]	0.9.3claws88
+2003-08-01 [christoph]	0.9.3claws89
+
+	* configure.ac
+		o try to build all plugins (except spamassassin) by default
+		o don't build a plugin if a dependency check fails
+
+	* src/common/hooks.c
+		fix warning
+
+2003-08-01 [match]	0.9.3claws88
 
 	* src/importldif.c
 		allow single click field selection. document code.
diff --git a/configure.ac b/configure.ac
index 4ec07cee6..594646720 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=3
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=88
+EXTRA_VERSION=89
 if test $EXTRA_VERSION -eq 0; then
     VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}claws
 else
@@ -387,7 +387,7 @@ PLUGINS=""
 
 AC_ARG_ENABLE(trayicon-plugin,
 	[  --enable-trayicon-plugin   System Tray Icon [default=no]],
-	[ac_cv_enable_trayicon_plugin=$enableval], [ac_cv_enable_trayicon_plugin=no])
+	[ac_cv_enable_trayicon_plugin=$enableval], [ac_cv_enable_trayicon_plugin=yes])
 AM_CONDITIONAL(BUILD_TRAYICON_PLUGIN, test x"$ac_cv_enable_trayicon_plugin" = xyes)
 if test x"$ac_cv_enable_trayicon_plugin" = xyes; then
 	PLUGINS="trayicon $PLUGINS"
@@ -404,10 +404,12 @@ fi
 
 AC_ARG_ENABLE(mathml-viewer-plugin,
 	[  --enable-mathml-viewer-plugin    Build MathML-Viewer plugin [default=no]],
-	[ac_cv_enable_mathml_viewer_plugin=$enableval], [ac_cv_enable_mathml_viewer_plugin=no])
+	[ac_cv_enable_mathml_viewer_plugin=$enableval], [ac_cv_enable_mathml_viewer_plugin=yes])
+if test x"$ac_cv_enable_mathml_viewer_plugin" = xyes; then
+	PKG_CHECK_MODULES(GTK_MATH_VIEW, gtkmathview >= 0.4.2, :, $ac_cv_enable_mathml_viewer_plugin=no)
+fi
 AM_CONDITIONAL(BUILD_MATHML_VIEWER_PLUGIN, test x"$ac_cv_enable_mathml_viewer_plugin" = xyes)
 if test x"$ac_cv_enable_mathml_viewer_plugin" = xyes; then
-	PKG_CHECK_MODULES(GTK_MATH_VIEW, gtkmathview >= 0.4.2)
 	AC_SUBST(GTK_MATH_VIEW_CFLAGS)
 	AC_SUBST(GTK_MATH_VIEW_LIBS)
 
@@ -450,7 +452,7 @@ fi
 
 AC_ARG_ENABLE(dillo-viewer-plugin,
 	[  --enable-dillo-viewer-plugin   Build Dillo plugin for html mail rendering [default=no]],
-	[ac_cv_enable_dillo_viewer_plugin=$enableval], [ac_cv_enable_dillo_viewer_plugin=no])
+	[ac_cv_enable_dillo_viewer_plugin=$enableval], [ac_cv_enable_dillo_viewer_plugin=yes])
 AM_CONDITIONAL(BUILD_DILLO_VIEWER_PLUGIN, test x"$ac_cv_enable_dillo_viewer_plugin" = xyes)
 if test x"$ac_cv_enable_dillo_viewer_plugin" = xyes; then
 	PLUGINS="dillo-viewer $PLUGINS"
@@ -466,15 +468,17 @@ fi
 
 AC_ARG_ENABLE(clamav-plugin,
 	[  --enable-clamav-plugin    Build Clam AntiVirus plugin [default=no]],
-	[ac_cv_enable_clamav_plugin=$enableval], [ac_cv_enable_clamav_plugin=no])
-AM_CONDITIONAL(BUILD_CLAMAV_PLUGIN, test x"$ac_cv_enable_clamav_plugin" = xyes)
+	[ac_cv_enable_clamav_plugin=$enableval], [ac_cv_enable_clamav_plugin=yes])
 if test x"$ac_cv_enable_clamav_plugin" = xyes; then
 	AC_CHECK_LIB(clamav, cl_scanfile, clamav_lib=-lclamav)
 	if test -z "${clamav_lib}"
 	then
-		AC_MSG_ERROR(clamav library not found)
+		AC_MSG_NOTICE(clamav library not found, will not plugin clamaw plugin)
 	fi
 	CLAMAV_LIBS="${clamav_lib}"
+fi
+AM_CONDITIONAL(BUILD_CLAMAV_PLUGIN, test x"$ac_cv_enable_clamav_plugin" = xyes)
+if test x"$ac_cv_enable_clamav_plugin" = xyes; then
 	AC_SUBST(CLAMAV_LIBS)
 
 	PLUGINS="clamav $PLUGINS"
diff --git a/src/common/hooks.c b/src/common/hooks.c
index 72b420b91..bf15f5a67 100644
--- a/src/common/hooks.c
+++ b/src/common/hooks.c
@@ -41,7 +41,7 @@ GHookList *hooks_get_hooklist(const gchar *hooklist_name)
 	
 	hooklist = g_new0(GHookList, 1);
 	g_hook_list_init(hooklist, sizeof(GHook));
-	g_hash_table_insert(hooklist_table, hooklist_name, hooklist);
+	g_hash_table_insert(hooklist_table, (gchar *) hooklist_name, hooklist);
 	
 	return hooklist;
 }
-- 
2.25.1