[Xfce4-commits] <xfce4-mailwatch-plugin:master> Add configured features to print

[Ján Sučan]

Updating branch refs/heads/master
         to 52bed2f3ab28b8a2161342de76ff1df09e80854b (commit)
       from 6c841f7d2714427a1fbd407575a6ff965d1effb2 (commit)

commit 52bed2f3ab28b8a2161342de76ff1df09e80854b
Author: Ján Sučan <sucan at runbox.com>
Date:   Sun Sep 15 10:34:24 2013 +0200

    Add configured features to print

 configure.ac.in |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/configure.ac.in b/configure.ac.in
index 97a7ecf..6fae290 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -80,17 +80,18 @@ XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-1.0], [4.8.0])
 XDT_CHECK_PACKAGE([EXO], [exo-1], [0.7.2])
 
 dnl Check for gnutls and libgcrypt support
+enable_ssl_support=no
 XDT_CHECK_OPTIONAL_PACKAGE([GNUTLS], [gnutls], [1.2.0], [ssl],
     [gnutls and libgcrypt support for secure IMAP/POP3 connections], [yes])
 if test "x$GNUTLS_FOUND" = "xyes"; then
     dnl libgcrypt does not provide a pkg-config file
     AM_PATH_LIBGCRYPT([1.2.0], LIBGCRYPT_FOUND=yes, LIBGCRYPT_FOUND=no)
     if test "x$LIBGCRYPT_FOUND" = "xyes"; then
+        enable_ssl_support=yes
         AC_DEFINE([HAVE_SSL_SUPPORT], [1], [Define if SSL support is enabled])
     fi
 fi
-AM_CONDITIONAL([HAVE_SSL_SUPPORT],
-               [test "x$GNUTLS_FOUND" = "xyes" -a "x$LIBGCRYPT_FOUND" = "xyes"])
+AM_CONDITIONAL([HAVE_SSL_SUPPORT], [test "x$enable_ssl_support" = "xyes"])
 
 dnl Check for IPv6 support
 AC_MSG_CHECKING([whether to support IPv6])
@@ -151,3 +152,6 @@ echo "Build Configuration:"
 echo
 echo "* Debug Support:    $enable_debug"
 echo
+echo "* IPv6 Support:     $enable_ipv6_support"
+echo "* SSL Support:      $enable_ssl_support"
+echo