diff options
| author | Christian Beier <dontmind@freeshell.org> | 2011-09-11 21:02:55 +0200 |
|---|---|---|
| committer | Gernot Tenchio <gernot@tenchio.de> | 2011-09-19 22:16:33 +0200 |
| commit | cb0340ccc5351a2ab31ad03b2dc13334ba349d71 (patch) | |
| tree | e814f8f48575d880c145f7c9babd2900fbfc0dfd | |
| parent | 2046cc9abd284528075abbaa758b148cece62d82 (diff) | |
| download | libvncserver-cb0340ccc5351a2ab31ad03b2dc13334ba349d71.zip libvncserver-cb0340ccc5351a2ab31ad03b2dc13334ba349d71.tar.gz | |
Autotools: Fix OpenSSL and GnuTLS advertisement.
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | libvncserver/Makefile.am | 8 |
2 files changed, 6 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 3e7c901..a986912 100644 --- a/configure.ac +++ b/configure.ac @@ -146,7 +146,7 @@ something like libssl-dev) and run configure again. [AC_DEFINE(HAVE_X509_PRINT_EX_FP) HAVE_X509_PRINT_EX_FP="true"], , $SSL_LIBS ) fi -AM_CONDITIONAL(HAVE_LIBSSL, test "x$with_crypto" != "xno" -a "x$with_ssl" != "xno") +AM_CONDITIONAL(HAVE_LIBSSL, test ! -z "$SSL_LIBS") # Checks for X libraries HAVE_X11="false" @@ -796,6 +796,7 @@ if test "x$with_gnutls" != "xno"; then AC_DEFINE(WITH_CLIENT_TLS) fi fi +AM_CONDITIONAL(HAVE_GNUTLS, test ! -z "$GNUTLS_LIBS") # IPv6 AH_TEMPLATE(IPv6, [Enable IPv6 support]) diff --git a/libvncserver/Makefile.am b/libvncserver/Makefile.am index 4a031af..98d97bc 100644 --- a/libvncserver/Makefile.am +++ b/libvncserver/Makefile.am @@ -17,11 +17,11 @@ if WITH_WEBSOCKETS if HAVE_LIBSSL WEBSOCKETSSSLSRCS = rfbssl_openssl.c else -#if HAVE_GNUTLS -#WEBSOCKETSSSLSRCS = rfbssl_gnutls.c -#else +if HAVE_GNUTLS +WEBSOCKETSSSLSRCS = rfbssl_gnutls.c +else WEBSOCKETSSSLSRCS = rfbssl_none.c -#endif +endif endif WEBSOCKETSSRCS = websockets.c ../common/md5.c ../common/sha1.c $(WEBSOCKETSSSLSRCS) |
