From 096f2266caf79203e4a2e41cd88cafd88f0f1df5 Mon Sep 17 00:00:00 2001 From: Vincent Torri Date: Fri, 25 Jun 2010 07:57:08 +0000 Subject: [PATCH] Windows can have both GnuTLS and OpenSSL installed too. SVN revision: 49852 --- legacy/eet/configure.ac | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/legacy/eet/configure.ac b/legacy/eet/configure.ac index b548f10c60..1d6c899221 100644 --- a/legacy/eet/configure.ac +++ b/legacy/eet/configure.ac @@ -53,20 +53,10 @@ AC_SUBST(release_info) ### Default options with respect to host -case "$host_os" in - mingw*) - want_gnutls="no" - want_openssl="no" - want_cipher="no" - want_signature="no" - ;; - *) - want_gnutls="auto" - want_openssl="auto" - want_cipher="yes" - want_signature="yes" - ;; -esac +want_gnutls="auto" +want_openssl="auto" +want_cipher="yes" +want_signature="yes" requirement_eet="" @@ -298,9 +288,9 @@ if test "x${want_openssl}" = "xyes" || test "x${want_openssl}" = "xauto" ; then fi if test "x${have_gnutls}" = "xyes" ; then - secure_layer="gnutls" + secure_layer="GnuTLS" elif test "x${have_openssl}" = "xyes" ; then - secure_layer="openssl" + secure_layer="OpenSSL" else secure_layer="no" fi