2010-10-02 [colin] 3.7.6cvs46

[claws.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 7ec9be9034a5d806f87c6af417d972a3c497eb9a..9cb0ff86b5894fd4e869dc0adaf5435623b7d264 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -9,10 +9,10 @@ PACKAGE=claws-mail
 dnl version number
 MAJOR_VERSION=3
 MINOR_VERSION=7
-MICRO_VERSION=5
+MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=34
+EXTRA_VERSION=46
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
@@ -174,7 +174,7 @@ case "$target" in
        ;;
 *-*-solaris*)
        CPPFLAGS="$CPPFLAGS -D_POSIX_PTHREAD_SEMANTICS"
-       CFLAGS="$CFLAGS -DSOLARIS"
+       CFLAGS="$CFLAGS -std=gnu99 -DSOLARIS"
        ;;
 esac
   
@@ -190,7 +190,7 @@ AC_CHECK_FUNCS(bind_textdomain_codeset)
 LIBS=$syl_save_LIBS
 
 dnl for gettext
-ALL_LINGUAS="bg ca cs de en_GB es fi fr hu id it ja nl pl pt_BR pt_PT ru sk sv zh_CN"
+ALL_LINGUAS="bg ca cs de en_GB es fi fr hu id it ja nl pl pt_BR pt_PT ru sk sv uk zh_CN"
 GETTEXT_PACKAGE=claws-mail
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Define text domain.])
@@ -382,16 +382,9 @@ fi
 
 dnl GNUTLS
 AC_MSG_CHECKING([whether to use 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=yes])
 
-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
-fi
 AC_MSG_RESULT($ac_cv_enable_gnutls)
 if test "x$ac_cv_enable_gnutls" != "xno"; then
   OCPPFLAGS="$CPPFLAGS"
@@ -973,7 +966,11 @@ if test x"$ac_cv_enable_libetpan" = xyes; then
        if test "x$libetpan_result" = "xyes"; then
           LIBETPAN_CPPFLAGS="`$libetpanconfig --cflags`"
           LIBETPAN_LIBS="`$libetpanconfig --libs`"
+           LIBETPAN_STABLE=`$libetpanconfig --version | grep -v ^0`
           LIBETPAN_VERSION=`$libetpanconfig --version | sed "s/\.//g" | sed "s/-.*$//"`
+           if test x"$LIBETPAN_STABLE" != "x"; then
+                LIBETPAN_VERSION="100"
+           fi
           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.])
@@ -1030,7 +1027,6 @@ src/plugins/bogofilter/Makefile
 src/plugins/spamassassin/Makefile
 src/plugins/dillo_viewer/Makefile
 src/plugins/trayicon/Makefile
-src/plugins/trayicon/libeggtrayicon/Makefile
 src/plugins/pgpcore/Makefile
 src/plugins/pgpmime/Makefile
 src/plugins/pgpinline/Makefile