fix bug where opening folder has massive slowdown when using the 'Display sender...

[claws.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index db345d3fd96b7cb07e8a8cf68d8a038294cd7176..c21e5ba08e6ebe9955e7ce37f630f851012de10c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=11
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws66
+EXTRA_VERSION=claws128
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
@@ -355,16 +355,16 @@ dnl *************************
 
 PLUGINS=""
 
-AC_ARG_ENABLE(demo-plugin,
-       [  --enable-demo-plugin    Build demo plugin [default=no]],
-       [ac_cv_enable_demo_plugin=$enableval], [ac_cv_enable_demo_plugin=no])
-AM_CONDITIONAL(BUILD_DEMO_PLUGIN, test x"$ac_cv_enable_demo_plugin" = xyes)
-if test x"$ac_cv_enable_demo_plugin" = xyes; then
-       PLUGINS="demo $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])
+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"
 fi
 
 AC_ARG_ENABLE(spamassassin-plugin,
-       [  --enable-spamassassin-plugin    Build spamassassin plugin [default=no]],
+       [  --enable-spamassassin-plugin    Build SpamAssassin plugin [default=no]],
        [ac_cv_enable_spamassassin_plugin=$enableval], [ac_cv_enable_spamassassin_plugin=no])
 AM_CONDITIONAL(BUILD_SPAMASSASSIN_PLUGIN, test x"$ac_cv_enable_spamassassin_plugin" = xyes)
 if test x"$ac_cv_enable_spamassassin_plugin" = xyes; then
@@ -373,7 +373,7 @@ if test x"$ac_cv_enable_spamassassin_plugin" = xyes; then
 fi
 
 AC_ARG_ENABLE(mathml-viewer-plugin,
-       [  --enable-mathml-viewer-plugin    Build MarhML-Viewer plugin [default=no]],
+       [  --enable-mathml-viewer-plugin    Build MathML-Viewer plugin [default=no]],
        [ac_cv_enable_mathml_viewer_plugin=$enableval], [ac_cv_enable_mathml_viewer_plugin=no])
 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
@@ -385,14 +385,6 @@ if test x"$ac_cv_enable_mathml_viewer_plugin" = xyes; then
        PLUGINS="mathml-viewer $PLUGINS"
 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])
-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"
-fi
-
 AC_ARG_ENABLE(image-viewer-plugin,
        [  --disable-image-viewer-plugin   Do not build image viewer plugin],
        [ac_cv_enable_image_viewer_plugin=$enableval], [ac_cv_enable_image_viewer_plugin=yes])
@@ -420,15 +412,37 @@ if test x"$ac_cv_enable_image_viewer_plugin" = xyes; then
 fi
 AM_CONDITIONAL(BUILD_IMAGE_VIEWER_PLUGIN, test x"$ac_cv_enable_image_viewer_plugin" = xyes)
 if test x"$ac_cv_enable_image_viewer_plugin" = xyes; then
-       PLUGINS="image $PLUGINS"
+       PLUGINS="image-viewer $PLUGINS"
 fi
 
-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])
-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"
+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])
+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"
+fi
+
+AC_ARG_ENABLE(demo-plugin,
+       [  --enable-demo-plugin    Build demo plugin [default=no]],
+       [ac_cv_enable_demo_plugin=$enableval], [ac_cv_enable_demo_plugin=no])
+AM_CONDITIONAL(BUILD_DEMO_PLUGIN, test x"$ac_cv_enable_demo_plugin" = xyes)
+if test x"$ac_cv_enable_demo_plugin" = xyes; then
+       PLUGINS="demo $PLUGINS"
+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)
+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)
+       fi
+       LIBS="${clamav_lib} ${LIBS}"
+       PLUGINS="clamav $PLUGINS"
 fi
 
 dnl ****************************
@@ -453,6 +467,7 @@ src/plugins/mathml_viewer/Makefile
 src/plugins/dillo_viewer/Makefile
 src/plugins/image_viewer/Makefile
 src/plugins/trayicon/Makefile
+src/plugins/clamav/Makefile
 faq/Makefile
 faq/de/Makefile
 faq/en/Makefile