dnl version number
MAJOR_VERSION=3
-MINOR_VERSION=2
+MINOR_VERSION=3
MICRO_VERSION=0
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=37
+EXTRA_VERSION=21
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
LIBS=$syl_save_LIBS
dnl for gettext
-ALL_LINGUAS="bg ca cs de el en_GB es fi fr hr hu it ja ko nb nl pl pt_BR ru sk sr sv zh_CN zh_TW"
+ALL_LINGUAS="bg ca cs de el en_GB es fi fr he hr hu it ja ko nb nl pl pt_BR ru sk sr sv zh_CN zh_TW"
GETTEXT_PACKAGE=claws-mail
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Define text domain.])
AC_SUBST(STARTUP_NOTIFICATION_LIBS)
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)
+
+dnl #######################################################################
+dnl # Check for NetworkManager support
+dnl #######################################################################
+if test x"$enable_dbus_glib" = xyes; then
+ AC_ARG_ENABLE(networkmanager-support, [ --disable-networkmanager-support disable NetworkManager support],,enable_networkmanager_support=yes)
+ if test x"$enable_networkmanager_support" = xyes; then
+ PKG_CHECK_MODULES(NETWORKMANAGER_SUPPORT, NetworkManager >= 0.6.2,
+ [
+ AC_DEFINE(HAVE_NETWORKMANAGER_SUPPORT, 1, [Define if NetworkManager support is to be included.])
+ echo "Building with NetworkManager support"
+ enable_networkmanager_support=yes
+ ],
+ [
+ echo "NetworkManager not found."
+ enable_networkmanager_support=no
+ ])
+ AC_SUBST(NETWORKMANAGER_SUPPORT_CFLAGS)
+ fi
+else
+ echo "NetworkManager support deactivated as D-Bus requirements were not met."
+ enable_networkmanager_support=no
+fi
+
dnl *************************
dnl ** section for plugins **
dnl *************************
fi
AM_CONDITIONAL(BUILD_DEMO_PLUGIN, test x"$ac_cv_enable_demo_plugin" = xyes)
-dnl --- ClamAV ---
-AC_MSG_CHECKING([whether to build ClamAV plugin])
-AC_ARG_ENABLE(clamav-plugin,
- [ --disable-clamav-plugin do not build Clam AntiVirus plugin],
- [ac_cv_enable_clamav_plugin=$enableval], [ac_cv_enable_clamav_plugin=yes])
-if test x"$ac_cv_enable_clamav_plugin" = xyes; then
- AC_MSG_RESULT(yes)
- PKG_CHECK_MODULES(CLAMAV, libclamav, ac_cv_enable_clamav_plugin=yes,
- ac_cv_enable_clamav_plugin=no)
- if test x"$ac_cv_enable_clamav_plugin" = xyes; then
- PLUGINS="clamav $PLUGINS"
- else
- AC_MSG_RESULT(not found)
- AC_MSG_WARN([*** ClamAV plugin will not be built ***])
- fi
-else
- AC_MSG_RESULT(no)
-fi
-AC_SUBST(CLAMAV_LIBS)
-AM_CONDITIONAL(BUILD_CLAMAV_PLUGIN, test x"$ac_cv_enable_clamav_plugin" = xyes)
-
dnl Libetpan
AC_MSG_CHECKING([whether to use libetpan])
AC_ARG_ENABLE(libetpan,
src/plugins/dillo_viewer/Makefile
src/plugins/trayicon/Makefile
src/plugins/trayicon/libeggtrayicon/Makefile
-src/plugins/clamav/Makefile
src/plugins/pgpcore/Makefile
src/plugins/pgpmime/Makefile
src/plugins/pgpinline/Makefile
echo "Libgnomeprint : $ac_cv_enable_gnomeprint"
echo "GTK+ print support: $ac_cv_have_gtk210"
echo "LibSM : $ac_cv_enable_libsm"
+echo "NetworkManager : $enable_networkmanager_support"
echo "Manual : $ac_cv_enable_manual"
echo "Plugins : $PLUGINS"
echo "Maemo build : $ac_cv_enable_maemo"