MICRO_VERSION=2
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=84
+EXTRA_VERSION=85
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
dnl Libetpan
AC_MSG_CHECKING([whether to use libetpan])
AC_ARG_ENABLE(libetpan,
- [ --disable-libetpan disable IMAP4 (libetpan) support],
+ [ --disable-libetpan disable IMAP4/NNTP (libetpan) support],
[ac_cv_enable_libetpan=$enableval], [ac_cv_enable_libetpan=yes])
if test x"$ac_cv_enable_libetpan" = xyes; then
AC_MSG_RESULT(yes)
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/])
- AC_MSG_RESULT([*** You can use --disable-libetpan if you don't need IMAP4 support.])
+ 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])
fi
AC_SUBST(LIBETPAN_FLAGS)
AC_SUBST(LIBETPAN_LIBS)
- AC_DEFINE(HAVE_LIBETPAN, 1, Define if you want IMAP support.)
+ 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([*** You can use --disable-libetpan if you don't need IMAP4 support.])
+ 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])
fi
else
echo ""
echo "$PACKAGE $VERSION"
echo ""
-echo "JPilot : $ac_cv_enable_jpilot"
-echo "LDAP : $ac_cv_enable_ldap"
-echo "OpenSSL : $ac_cv_enable_openssl"
-echo "gnuTLS : $ac_cv_enable_gnutls"
-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 "IMAP4 : $ac_cv_enable_libetpan"
-echo "Crash dialog : $ac_cv_enable_crash_dialog"
-echo "Libgnomeprint : $ac_cv_enable_gnomeprint (GTK+ 2.10: $ac_cv_have_gtk210)"
-echo "LibSM : $ac_cv_enable_libsm"
-echo "Manual : $ac_cv_enable_manual"
-echo "Plugins : $PLUGINS"
-echo "Maemo build : $ac_cv_enable_maemo"
-echo "Config dir : $ac_cv_with_config_dir"
+echo "JPilot : $ac_cv_enable_jpilot"
+echo "LDAP : $ac_cv_enable_ldap"
+echo "OpenSSL : $ac_cv_enable_openssl"
+echo "gnuTLS : $ac_cv_enable_gnutls"
+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 "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 "Manual : $ac_cv_enable_manual"
+echo "Plugins : $PLUGINS"
+echo "Maemo build : $ac_cv_enable_maemo"
+echo "Config dir : $ac_cv_with_config_dir"
echo ""
echo "The binary will be installed in $prefix/bin"
echo ""
stock_pixbuf_gdk(window, STOCK_PIXMAP_CHECKBOX_ON, &active_pixbuf);
stock_pixbuf_gdk(window, STOCK_PIXMAP_CHECKBOX_OFF, &inactive_pixbuf);
-#if INET6
+#if HAVE_LIBCOMPFACE
gtk_text_buffer_insert_pixbuf(buffer, &iter, active_pixbuf);
#else
gtk_text_buffer_insert_pixbuf(buffer, &iter, inactive_pixbuf);
#endif
- gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, (" IPv6 "), -1,
+ gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, (" compface "), -1,
"bold", NULL);
gtk_text_buffer_insert(buffer, &iter,
- (gchar *)Q_("IPv6|adds support for IPv6 addresses, the new internet "
- "addressing protocol\n"), -1);
+ (gchar *)Q_("compface|adds support for the X-Face header\n"), -1);
-#if HAVE_ICONV
+#if USE_ASPELL
gtk_text_buffer_insert_pixbuf(buffer, &iter, active_pixbuf);
#else
gtk_text_buffer_insert_pixbuf(buffer, &iter, inactive_pixbuf);
#endif
- gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, (" iconv "), -1,
+ gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, (" GNU/aspell "), -1,
"bold", NULL);
gtk_text_buffer_insert(buffer, &iter,
- (gchar *)Q_("iconv|allows converting to and from different character sets\n"), -1);
+ (gchar *)Q_("GNU/aspell|adds support for spell checking\n"), -1);
-#if HAVE_LIBCOMPFACE
+#if USE_GNUTLS
gtk_text_buffer_insert_pixbuf(buffer, &iter, active_pixbuf);
#else
gtk_text_buffer_insert_pixbuf(buffer, &iter, inactive_pixbuf);
#endif
- gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, (" compface "), -1,
+ gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, (" GnuTLS "), -1,
"bold", NULL);
gtk_text_buffer_insert(buffer, &iter,
- (gchar *)Q_("compface|adds support for the X-Face header\n"), -1);
+ (gchar *)Q_("GnuTLS|adds support for encrypted connections to servers\n"), -1);
-#if USE_OPENSSL
+#if GTK_CHECK_VERSION(2,10,0) && !defined(USE_GNOMEPRINT)
gtk_text_buffer_insert_pixbuf(buffer, &iter, active_pixbuf);
#else
gtk_text_buffer_insert_pixbuf(buffer, &iter, inactive_pixbuf);
#endif
- gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, (" OpenSSL "), -1,
+ gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, (" GTK+ >= 2.10.0 "), -1,
"bold", NULL);
gtk_text_buffer_insert(buffer, &iter,
- (gchar *)Q_("OpenSSL|adds support for encrypted connections to servers\n"), -1);
+ (gchar *)Q_("GTK+ >= 2.10.0|adds support for a complete print dialog\n"), -1);
-#if USE_GNUTLS
+#if INET6
gtk_text_buffer_insert_pixbuf(buffer, &iter, active_pixbuf);
#else
gtk_text_buffer_insert_pixbuf(buffer, &iter, inactive_pixbuf);
#endif
- gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, (" GnuTLS "), -1,
+ gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, (" IPv6 "), -1,
"bold", NULL);
gtk_text_buffer_insert(buffer, &iter,
- (gchar *)Q_("GnuTLS|is another mean of adding support for encrypted connections to servers\n"), -1);
+ (gchar *)Q_("IPv6|adds support for IPv6 addresses, the new internet "
+ "addressing protocol\n"), -1);
-#if USE_LDAP
+#if HAVE_ICONV
gtk_text_buffer_insert_pixbuf(buffer, &iter, active_pixbuf);
#else
gtk_text_buffer_insert_pixbuf(buffer, &iter, inactive_pixbuf);
#endif
- gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, (" LDAP "), -1,
+ gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, (" iconv "), -1,
"bold", NULL);
gtk_text_buffer_insert(buffer, &iter,
- (gchar *)Q_("LDAP|adds support for LDAP shared addressbooks\n"), -1);
+ (gchar *)Q_("iconv|allows converting to and from different character sets\n"), -1);
#if USE_JPILOT
gtk_text_buffer_insert_pixbuf(buffer, &iter, active_pixbuf);
gtk_text_buffer_insert(buffer, &iter,
(gchar *)Q_("JPilot|adds support for PalmOS addressbooks\n"), -1);
-#if USE_ASPELL
+#if USE_LDAP
gtk_text_buffer_insert_pixbuf(buffer, &iter, active_pixbuf);
#else
gtk_text_buffer_insert_pixbuf(buffer, &iter, inactive_pixbuf);
#endif
- gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, (" GNU/aspell "), -1,
+ gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, (" LDAP "), -1,
"bold", NULL);
gtk_text_buffer_insert(buffer, &iter,
- (gchar *)Q_("GNU/aspell|adds support for spell checking\n"), -1);
+ (gchar *)Q_("LDAP|adds support for LDAP shared addressbooks\n"), -1);
#if HAVE_LIBETPAN
gtk_text_buffer_insert_pixbuf(buffer, &iter, active_pixbuf);
gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, (" libetpan "), -1,
"bold", NULL);
gtk_text_buffer_insert(buffer, &iter,
- (gchar *)Q_("libetpan|adds support for IMAP servers\n"), -1);
+ (gchar *)Q_("libetpan|adds support for IMAP and NNTP servers\n"), -1);
#if USE_GNOMEPRINT
gtk_text_buffer_insert_pixbuf(buffer, &iter, active_pixbuf);
gtk_text_buffer_insert(buffer, &iter,
(gchar *)Q_("libSM|adds support for session handling\n"), -1);
+#if USE_OPENSSL
+ gtk_text_buffer_insert_pixbuf(buffer, &iter, active_pixbuf);
+#else
+ gtk_text_buffer_insert_pixbuf(buffer, &iter, inactive_pixbuf);
+#endif
+ gtk_text_buffer_insert_with_tags_by_name(buffer, &iter, (" OpenSSL "), -1,
+ "bold", NULL);
+ gtk_text_buffer_insert(buffer, &iter,
+ (gchar *)Q_("OpenSSL|adds support for encrypted connections to servers\n"), -1);
+
return scrolledwin;
}