2010-10-02 [colin] 3.7.6cvs46

[claws.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 2e31026a6afc99b474cf99533c8cc46935b2eaa9..9cb0ff86b5894fd4e869dc0adaf5435623b7d264 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=3
+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
   
@@ -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"
@@ -1034,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