dnl version number
MAJOR_VERSION=3
-MINOR_VERSION=0
-MICRO_VERSION=2
+MINOR_VERSION=1
+MICRO_VERSION=0
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=67
+EXTRA_VERSION=19
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
dnl Check for OpenSSL
AC_ARG_ENABLE(openssl,
- [ --disable-openssl disable SSL (OpenSSL) support.],
+ [ --disable-openssl disable OpenSSL support.],
[ac_cv_enable_openssl=$enableval], [ac_cv_enable_openssl=yes])
+dnl GNUTLS
+AC_ARG_ENABLE(gnutls, [ --enable-gnutls enable GnuTLS support],
+ [ac_cv_enable_gnutls=$enableval], [ac_cv_enable_gnutls=no])
+if test x$ac_cv_enable_openssl = xyes && test x$ac_cv_enable_gnutls != xyes; then
+ ac_cv_enable_gnutls="no"
+fi
+if test x$ac_cv_enable_gnutls = xyes; then
+ ac_cv_enable_openssl="no"
+fi
+
AC_MSG_CHECKING([whether to use OpenSSL])
if test x"$ac_cv_enable_openssl" = xyes; then
AC_MSG_RESULT(yes)
AC_SUBST(OPENSSL_CFLAGS)
AC_SUBST(OPENSSL_LIBS)
+AC_MSG_CHECKING([whether to use GnuTLS])
+if test "x$ac_cv_enable_gnutls" != "xno"; then
+ OCPPFLAGS="$CPPFLAGS"
+ OLDFLAGS="$LDFLAGS"
+ GNUTLS_LIBS=""
+ AC_CHECK_HEADER(gnutls/gnutls.h, [
+ AC_CHECK_LIB(gnutls, gnutls_global_deinit,
+ [AC_DEFINE(USE_GNUTLS, 1, Define to use GnuTLS.)],
+ [ac_cv_enable_gnutls=no])
+ ],[ac_cv_enable_gnutls=no])
+ if test "x$ac_cv_enable_gnutls" != "xyes"; then
+ CPPFLAGS="$OCPPFLAGS"
+ LDFLAGS="$OLDFLAGS"
+ fi
+fi
+if test "x$ac_cv_enable_gnutls" = "xyes"; then
+ AC_DEFINE([USE_GNUTLS],1, [Define to use GnuTLS])
+ GNUTLS_LIBS="-lgnutls"
+else
+ GNUTLS_LIBS=""
+fi
+AC_SUBST(GNUTLS_LIBS)
+
dnl password encryption
OLDLIBS=$LIBS
LIBS=
AC_SUBST(MAEMO_CFLAGS)
AC_SUBST(MAEMO_LIBS)
if test $ac_cv_enable_maemo = no; then
- AC_MSG_ERROR(libosso, hildon-libs or hildon-fm not found)
+ #test for chinook
+ PKG_CHECK_MODULES(MAEMO, libosso hildon-1 hildon-fm-2 gnome-vfs-2.0 hal, ac_cv_enable_maemo=yes,
+ ac_cv_enable_maemo=no)
+ AC_SUBST(MAEMO_CFLAGS)
+ AC_SUBST(MAEMO_LIBS)
+ if test $ac_cv_enable_maemo = no; then
+ AC_MSG_ERROR(one of libosso hildon-libs hildon-fm hildon-1 hildon-fm-2 not found)
+ else
+ AC_DEFINE(MAEMO, 1, Build for maemo)
+ AC_DEFINE(CHINOOK, 1, Maemo chinook)
+ fi
else
AC_DEFINE(MAEMO, 1, Build for maemo)
fi
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
AM_CONDITIONAL(CLAWS_LIBETPAN, test "x$libetpan_result" = "xyes")
-dnl Printing support. GTK will be used if present and gnomeprint is not explicitely enabled
+dnl Printing support.
PKG_CHECK_MODULES(GTK210, gtk+-2.0 >= 2.10, ac_cv_have_gtk210=yes, ac_cv_have_gtk210=no)
+
AC_MSG_CHECKING([whether to use libgnomeprint])
AC_ARG_ENABLE(gnomeprint,
[ --disable-gnomeprint disable libgnomeprint support],
[ac_cv_enable_gnomeprint=$enableval], [ac_cv_enable_gnomeprint=auto])
+
+if test x$ac_cv_have_gtk210 = xyes; then
+ ac_cv_enable_gnomeprint="no"
+fi
+
if test x$ac_cv_enable_gnomeprint = xyes \
-o \( x$ac_cv_enable_gnomeprint = xauto \
-a x$ac_cv_have_gtk210 = xno \); then
echo ""
echo "$PACKAGE $VERSION"
echo ""
-echo "JPilot : $ac_cv_enable_jpilot"
-echo "LDAP : $ac_cv_enable_ldap"
-echo "OpenSSL : $ac_cv_enable_openssl"
-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 ""