From a0cee790cff93a4076abb3850f37f40b14a47b08 Mon Sep 17 00:00:00 2001 From: Christian Beier Date: Mon, 30 Apr 2012 22:15:11 +0200 Subject: [PATCH] LibVNCServer: Prefer GnuTLS over OpenSSL to be in sync with LibVNCClient. --- libvncserver/Makefile.am | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libvncserver/Makefile.am b/libvncserver/Makefile.am index cc1acfb..deb0e09 100644 --- a/libvncserver/Makefile.am +++ b/libvncserver/Makefile.am @@ -14,14 +14,14 @@ endif if WITH_WEBSOCKETS -if HAVE_LIBSSL -WEBSOCKETSSSLSRCS = rfbssl_openssl.c rfbcrypto_openssl.c -WEBSOCKETSSSLLIBS = @SSL_LIBS@ @CRYPT_LIBS@ -else if HAVE_GNUTLS WEBSOCKETSSSLSRCS = rfbssl_gnutls.c rfbcrypto_gnutls.c WEBSOCKETSSSLLIBS = @GNUTLS_LIBS@ else +if HAVE_LIBSSL +WEBSOCKETSSSLSRCS = rfbssl_openssl.c rfbcrypto_openssl.c +WEBSOCKETSSSLLIBS = @SSL_LIBS@ @CRYPT_LIBS@ +else WEBSOCKETSSSLSRCS = rfbssl_none.c rfbcrypto_included.c ../common/md5.c ../common/sha1.c endif endif