2007-10-30 [paul] 3.0.2cvs107

[claws.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 423f71518b3c2111b08e6c9a72f259c746677d7e..1706bee180148efa31698e05f8053b51354f273b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=0
 MICRO_VERSION=2
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=66
+EXTRA_VERSION=107
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
@@ -363,7 +363,7 @@ fi
 
 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])
 AC_MSG_CHECKING([whether to use OpenSSL])
 if test x"$ac_cv_enable_openssl" = xyes; then
@@ -371,6 +371,7 @@ if test x"$ac_cv_enable_openssl" = xyes; then
        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)
+               disable_gnutls="yes"
        else
                AC_MSG_RESULT(not found)
                AC_MSG_WARN([*** OpenSSL will not be supported ***])
@@ -381,6 +382,37 @@ fi
 AC_SUBST(OPENSSL_CFLAGS)
 AC_SUBST(OPENSSL_LIBS)
 
+dnl GNUTLS
+AC_ARG_ENABLE(gnutls,    [ --disable-gnutls      disable GnuTLS support],
+            [ac_cv_enable_gnutls=$enableval], [ac_cv_enable_gnutls=yes])
+if test "x$disable_gnutls" != "xyes"; then
+       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"
+         disable_openssl="yes"
+       else
+         GNUTLS_LIBS=""
+       fi
+else
+       ac_cv_enable_gnutls="no"
+fi
+AC_SUBST(GNUTLS_LIBS)
+
 dnl password encryption
 OLDLIBS=$LIBS
 LIBS=
@@ -808,7 +840,7 @@ AM_CONDITIONAL(BUILD_CLAMAV_PLUGIN, test x"$ac_cv_enable_clamav_plugin" = xyes)
 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)
@@ -830,15 +862,15 @@ if test x"$ac_cv_enable_libetpan" = xyes; then
           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
@@ -951,21 +983,24 @@ dnl Output the configuration summary
 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 ""