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

diff --git a/ChangeLog.claws b/ChangeLog.claws
index a265534a8c1300c3bb7a31a32c56754b6836a279..576bb6f4ff8da6f1ecc89cfe1f41ec8f2a6ca024 100644 (file)
--- 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.
 
        * src/importldif.c
                allow single click field selection. document code.

diff --git a/configure.ac b/configure.ac
index 4ec07cee6b0c5ecd66abf476c1d76ecbcca1ba33..594646720ac0bfc5d4cd23aa2eedd4fda0fdfb4e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=3
 INTERFACE_AGE=0
 BINARY_AGE=0
 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
 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_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"
 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_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
 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)
 
        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_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"
 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_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
 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
        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"
        AC_SUBST(CLAMAV_LIBS)
 
        PLUGINS="clamav $PLUGINS"

diff --git a/src/common/hooks.c b/src/common/hooks.c
index 72b420b9161c82593fd28e6b3a8763f21e1d1423..bf15f5a67dd3eb82534cc3dbf70517f55cf7e9b8 100644 (file)
--- 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));
        
        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;
 }
        
        return hooklist;
 }