MICRO_VERSION=0
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=61
+EXTRA_VERSION=125
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
CFLAGS="$CFLAGS -Wall"
if test $USE_MAINTAINER_MODE = yes; then
- CFLAGS="$CFLAGS -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DG_DISABLE_DEPRECATED"
+ CFLAGS="$CFLAGS -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DG_DISABLE_DEPRECATED -DGTK_DISABLE_SINGLE_INCLUDES"
fi
pthread_name=
AC_SUBST(GTK_CFLAGS)
AC_SUBST(GTK_LIBS)
-dnl GNU/Aspell is used for spell checking
-AC_ARG_ENABLE(aspell,
- [ --disable-aspell disable GNU/aspell support],
- [ac_cv_enable_aspell=$enableval], [ac_cv_enable_aspell=yes])
-AC_MSG_CHECKING([whether to use GNU/aspell])
-if test $ac_cv_enable_aspell = yes; then
- AC_MSG_RESULT(yes)
- AM_PATH_ASPELL(0.50, AC_DEFINE(USE_ASPELL, 1, Define if you use ASPELL to support spell checking),
- [use_aspell=no ac_cv_enable_aspell=no])
-else
- AC_MSG_RESULT(no)
+dnl enchant is used for spell checking
+AC_ARG_ENABLE(enchant,
+ [ --disable-enchant disable enchant support],
+ [ac_cv_enable_enchant=$enableval], [ac_cv_enable_enchant=yes])
+AC_MSG_CHECKING([whether to use enchant])
+if test $ac_cv_enable_enchant = yes; then
+ PKG_CHECK_MODULES(ENCHANT, enchant >= 1.0.0,
+ [
+ AC_DEFINE(USE_ENCHANT, 1, enchant)
+ echo "Building with enchant"
+ ac_cv_enable_enchant=yes
+ ],
+ [
+ echo "Building without enchant-notification"
+ ac_cv_enable_enchant=no
+ ])
+ AC_SUBST(ENCHANT_CFLAGS)
+ AC_SUBST(ENCHANT_LIBS)
fi
dnl want crash dialog
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
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,
LIBETPAN_CPPFLAGS="`$libetpanconfig --cflags`"
LIBETPAN_LIBS="`$libetpanconfig --libs`"
LIBETPAN_VERSION=`$libetpanconfig --version | sed "s/\.//g" | sed "s/-.*$//"`
- if test "$LIBETPAN_VERSION" -lt "049"; then
- AC_MSG_RESULT([*** Claws Mail requires libetpan 0.49 or newer. See http://www.etpan.org/])
+ if test "$LIBETPAN_VERSION" -lt "056"; then
+ AC_MSG_RESULT([*** Claws Mail requires libetpan 0.56 or newer. See http://www.etpan.org/])
AC_MSG_RESULT([*** You can use --disable-libetpan if you don't need IMAP4 and/or NNTP support.])
- AC_MSG_ERROR([libetpan 0.49 not found])
+ AC_MSG_ERROR([libetpan 0.56 not found])
fi
AC_SUBST(LIBETPAN_FLAGS)
AC_SUBST(LIBETPAN_LIBS)
AC_DEFINE(HAVE_LIBETPAN, 1, Define if you want IMAP and/or NNTP support.)
else
- AC_MSG_RESULT([*** Claws Mail requires libetpan 0.49 or newer. See http://www.etpan.org/ ])
+ AC_MSG_RESULT([*** Claws Mail requires libetpan 0.56 or newer. See http://www.etpan.org/ ])
AC_MSG_RESULT([*** You can use --disable-libetpan if you don't need IMAP4 and/or NNTP support.])
- AC_MSG_ERROR([libetpan 0.49 not found])
+ AC_MSG_ERROR([libetpan 0.56 not found])
fi
else
AC_MSG_RESULT(no)
src/plugins/pgpcore/Makefile
src/plugins/pgpmime/Makefile
src/plugins/pgpinline/Makefile
+src/plugins/smime/Makefile
doc/Makefile
doc/man/Makefile
tools/Makefile
echo "iconv : $am_cv_func_iconv"
echo "compface : $ac_cv_enable_compface"
echo "IPv6 : $ac_cv_enable_ipv6"
-echo "GNU/aspell : $ac_cv_enable_aspell"
+echo "enchant : $ac_cv_enable_enchant"
echo "IMAP4 : $ac_cv_enable_libetpan"
echo "NNTP : $ac_cv_enable_libetpan"
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"