2008-10-17 [paul] 3.6.1cvs8

[claws.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 2f18677f2a75bfde0520738c95115b670d467ce8..0e0061cb7d81c0dcebf85a86d0ec4ebb315bb1c5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -7,11 +7,11 @@ PACKAGE=claws-mail
 
 dnl version number
 MAJOR_VERSION=3
-MINOR_VERSION=5
-MICRO_VERSION=0
+MINOR_VERSION=6
+MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=134
+EXTRA_VERSION=8
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
@@ -178,7 +178,7 @@ AC_CHECK_FUNCS(bind_textdomain_codeset)
 LIBS=$syl_save_LIBS
 
 dnl for gettext
-ALL_LINGUAS="ca de en_GB es fi fr hu it pl pt_BR sk sr zh_CN"
+ALL_LINGUAS="bg ca de en_GB es fi fr hu it nl pl pt_BR ru sk sr sv zh_CN"
 GETTEXT_PACKAGE=claws-mail
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Define text domain.])
@@ -366,36 +366,17 @@ else
        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"
@@ -958,18 +939,18 @@ if test x"$ac_cv_enable_libetpan" = xyes; then
           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)
@@ -1089,7 +1070,6 @@ 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"