2008-10-06 [colin] 3.6.0cvs7

[claws.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 8dd26cc32680f8074edf736de020458d36de6a9b..172cd5d76d3b37b2fb3cc7695f42c270a735caf6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -7,11 +7,11 @@ PACKAGE=claws-mail
 
 dnl version number
 MAJOR_VERSION=3
-MINOR_VERSION=5
+MINOR_VERSION=6
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=118
+EXTRA_VERSION=7
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
@@ -178,7 +178,7 @@ AC_CHECK_FUNCS(bind_textdomain_codeset)
 LIBS=$syl_save_LIBS
 
 dnl for gettext
-ALL_LINGUAS="ca de en_GB es fi fr hu it pl pt_BR sk sr zh_CN"
+ALL_LINGUAS="bg ca de en_GB es fi fr hu it nl pl pt_BR ru sk sr sv zh_CN"
 GETTEXT_PACKAGE=claws-mail
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Define text domain.])
@@ -750,17 +750,21 @@ fi
 dnl #######################################################################
 dnl # Check for D-Bus support
 dnl #######################################################################
-PKG_CHECK_MODULES(DBUS, [dbus-1 >= 0.60, dbus-glib-1 >= 0.60],
-[
-       AC_DEFINE(HAVE_DBUS_GLIB, 1, [Define if glib bindings of D-Bus are available])
-       enable_dbus_glib=yes
-],
-[
-       echo "D-Bus requirements not met. D-Bus support not activated."
-       enable_dbus_glib=no
-])
-AC_SUBST(DBUS_CFLAGS)
-AC_SUBST(DBUS_LIBS)
+AC_ARG_ENABLE(dbus, [  --disable-dbus    disable dbus support],,enable_dbus=yes)
+
+if test "x$enable_dbus" = "xyes"; then
+       PKG_CHECK_MODULES(DBUS, [dbus-1 >= 0.60, dbus-glib-1 >= 0.60],
+       [
+               AC_DEFINE(HAVE_DBUS_GLIB, 1, [Define if glib bindings of D-Bus are available])
+               enable_dbus_glib=yes
+       ],
+       [
+               echo "D-Bus requirements not met. D-Bus support not activated."
+               enable_dbus_glib=no
+       ])
+       AC_SUBST(DBUS_CFLAGS)
+       AC_SUBST(DBUS_LIBS)
+fi
 
 dnl #######################################################################
 dnl # Check for NetworkManager support
@@ -892,6 +896,23 @@ else
 fi
 AM_CONDITIONAL(BUILD_PGPINLINE_PLUGIN, test x"$ac_cv_enable_pgpinline_plugin" = xyes)
 
+AC_MSG_CHECKING([whether to build S/Mime plugin])
+AC_ARG_ENABLE(smime-plugin,
+       [  --disable-smime-plugin           do not build S/Mime plugin],
+       [ac_cv_enable_smime_plugin=$enableval], [ac_cv_enable_smime_plugin=yes])
+if test x"$ac_cv_enable_smime_plugin" = xyes; then
+       AC_MSG_RESULT(yes)
+       if test x"$ac_cv_enable_pgpcore_plugin" = xyes; then
+               PLUGINS="smime $PLUGINS"
+       else
+               AC_MSG_WARN([*** S/Mime plugin cannot be built ***])
+               AC_MSG_WARN([*** without the PGP/CORE plugin     ***])
+       fi
+else
+       AC_MSG_RESULT(no)
+fi
+AM_CONDITIONAL(BUILD_SMIME_PLUGIN, test x"$ac_cv_enable_smime_plugin" = xyes)
+
 dnl --- Dillo Viewer ---
 AC_MSG_CHECKING([whether to build Dillo plugin])
 AC_ARG_ENABLE(dillo-viewer-plugin,
@@ -1029,6 +1050,7 @@ src/plugins/trayicon/libeggtrayicon/Makefile
 src/plugins/pgpcore/Makefile
 src/plugins/pgpmime/Makefile
 src/plugins/pgpinline/Makefile
+src/plugins/smime/Makefile
 doc/Makefile
 doc/man/Makefile
 tools/Makefile
@@ -1079,6 +1101,7 @@ echo "Crash dialog      : $ac_cv_enable_crash_dialog"
 echo "Libgnomeprint     : $ac_cv_enable_gnomeprint"
 echo "GTK+ print support: $ac_cv_have_gtk210"
 echo "LibSM             : $ac_cv_enable_libsm"
+echo "DBUS              : $enable_dbus"
 echo "NetworkManager    : $enable_networkmanager_support"
 echo "Manual            : $ac_cv_enable_manual"
 echo "Plugins           : $PLUGINS"