sync with 0.8.8cvs5

[claws.git] / configure.in

diff --git a/configure.in b/configure.in
index d875ec1b5d236d7f52a4df873714b29b0fd7adbe..d2d44c6083af5569db667b6ead4e626f891bfeae 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=8
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws3
+EXTRA_VERSION=claws86
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
@@ -194,14 +194,6 @@ fi
 dnl Check for OpenSSL
 AM_PATH_OPENSSL
 
-dnl Check for libjconv
-AC_ARG_ENABLE(jconv,
-       [  --disable-jconv         Do not use libjconv],
-       [ac_cv_enable_jconv=$enableval], [ac_cv_enable_jconv=yes])
-if test "$ac_cv_enable_jconv" = yes; then
-       AC_CHECK_LIB(jconv, jconv_alloc_conv,,[ac_cv_enable_jconv=no])
-fi
-
 dnl ************************
 dnl ** GTK user interface **
 dnl ************************
@@ -373,7 +365,6 @@ dnl ** section for plugins **
 dnl *************************
 
 PLUGINS=""
-PLUGINDIR=${prefix}/${DATADIRNAME}/${PACKAGE}/plugins
 
 AC_ARG_ENABLE(demo-plugin,
        [  --enable-demo-plugin    Build demo plugin [default=no]],
@@ -382,9 +373,17 @@ if test x"$ac_cv_enable_demo_plugin" = xyes; then
        PLUGINS="demo $PLUGINS"
 fi
 
+AC_ARG_ENABLE(spamassassin-plugin,
+       [  --enable-spamassassin-plugin    Build spamassassin plugin [default=no]],
+       [ac_cv_enable_spamassassin_plugin=$enableval], [ac_cv_enable_spamassassin_plugin=no])
+if test x"$ac_cv_enable_spamassassin_plugin" = xyes; then
+       AC_SPAMASSASSIN
+
+       PLUGINS="spamassassin $PLUGINS"
+fi
+
 AC_SUBST(PLUGINS)
 AC_SUBST(PLUGINDIR)
-AC_DEFINE(PLUGINDIR, "$PLUGINDIR", Path where plugins will be installed)
 
 dnl ****************************
 dnl ** Final configure output **
@@ -402,6 +401,7 @@ src/common/Makefile
 src/gtk/Makefile
 src/plugins/Makefile
 src/plugins/demo/Makefile
+src/plugins/spamassassin/Makefile
 faq/Makefile
 faq/de/Makefile
 faq/en/Makefile
@@ -435,7 +435,6 @@ echo "JPilot        : $ac_cv_enable_jpilot"
 echo "LDAP          : $ac_cv_enable_ldap"
 echo "OpenSSL       : $ac_cv_enable_openssl"
 echo "compface      : $ac_cv_enable_compface"
-echo "libjconv      : $ac_cv_enable_jconv"
 echo "IPv6          : $ac_cv_enable_ipv6"
 echo "GNU/aspell    : $ac_cv_enable_aspell"
 echo "Crash dialog  : $ac_cv_enable_crash_dialog"