dnl version number
MAJOR_VERSION=3
MINOR_VERSION=6
-MICRO_VERSION=0
+MICRO_VERSION=1
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=12
+EXTRA_VERSION=10
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
AC_MSG_RESULT(no)
fi
-dnl Check for OpenSSL
-AC_ARG_ENABLE(openssl,
- [ --disable-openssl disable OpenSSL support.],
- [ac_cv_enable_openssl=$enableval], [ac_cv_enable_openssl=yes])
dnl GNUTLS
+AC_ARG_ENABLE(openssl, [ --enable-openssl enable GnuTLS support],
+ [ac_cv_enable_openssl=$enableval], [ac_cv_enable_openssl=no])
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_cv_enable_gnutls=$enableval], [ac_cv_enable_gnutls=yes])
-AC_MSG_CHECKING([whether to use OpenSSL])
-if test x"$ac_cv_enable_openssl" = xyes; then
- AC_MSG_RESULT(yes)
- PKG_CHECK_MODULES(OPENSSL, openssl >= 0.9.7, :, ac_cv_enable_openssl=no)
- if test x$ac_cv_enable_openssl = xyes; then
- AC_DEFINE(USE_OPENSSL, 1, Define if you want OpenSSL support)
- else
- AC_MSG_RESULT(not found)
- AC_MSG_WARN([*** OpenSSL will not be supported ***])
+if test "x$ac_cv_enable_gnutls" != "xyes"; then
+ if test "x$ac_cv_enable_openssl" = "xyes"; then
+ AC_MSG_ERROR(*** Use GnuTLS instead of OpenSSL due to licensing ***)
fi
-else
- AC_MSG_RESULT(no)
fi
-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"
LIBETPAN_CPPFLAGS="`$libetpanconfig --cflags`"
LIBETPAN_LIBS="`$libetpanconfig --libs`"
LIBETPAN_VERSION=`$libetpanconfig --version | sed "s/\.//g" | sed "s/-.*$//"`
- if test "$LIBETPAN_VERSION" -lt "056"; then
- AC_MSG_RESULT([*** Claws Mail requires libetpan 0.56 or newer. See http://www.etpan.org/])
+ if test "$LIBETPAN_VERSION" -lt "057"; then
+ AC_MSG_RESULT([*** Claws Mail requires libetpan 0.57 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.56 not found])
+ AC_MSG_ERROR([libetpan 0.57 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.56 or newer. See http://www.etpan.org/ ])
+ AC_MSG_RESULT([*** Claws Mail requires libetpan 0.57 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.56 not found])
+ AC_MSG_ERROR([libetpan 0.57 not found])
fi
else
AC_MSG_RESULT(no)
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"