Autotools: Fix OpenSSL and GnuTLS advertisement.

pull/1/head
Christian Beier 13 years ago
parent 431518add4
commit fa458d48ec

@ -145,7 +145,7 @@ something like libssl-dev) and run configure again.
[AC_DEFINE(HAVE_X509_PRINT_EX_FP) HAVE_X509_PRINT_EX_FP="true"], , $SSL_LIBS [AC_DEFINE(HAVE_X509_PRINT_EX_FP) HAVE_X509_PRINT_EX_FP="true"], , $SSL_LIBS
) )
fi 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 # Checks for X libraries
HAVE_X11="false" HAVE_X11="false"
@ -795,6 +795,7 @@ if test "x$with_gnutls" != "xno"; then
AC_DEFINE(WITH_CLIENT_TLS) AC_DEFINE(WITH_CLIENT_TLS)
fi fi
fi fi
AM_CONDITIONAL(HAVE_GNUTLS, test ! -z "$GNUTLS_LIBS")
# IPv6 # IPv6
AH_TEMPLATE(IPv6, [Enable IPv6 support]) AH_TEMPLATE(IPv6, [Enable IPv6 support])

@ -17,11 +17,11 @@ if WITH_WEBSOCKETS
if HAVE_LIBSSL if HAVE_LIBSSL
WEBSOCKETSSSLSRCS = rfbssl_openssl.c WEBSOCKETSSSLSRCS = rfbssl_openssl.c
else else
#if HAVE_GNUTLS if HAVE_GNUTLS
#WEBSOCKETSSSLSRCS = rfbssl_gnutls.c WEBSOCKETSSSLSRCS = rfbssl_gnutls.c
#else else
WEBSOCKETSSSLSRCS = rfbssl_none.c WEBSOCKETSSSLSRCS = rfbssl_none.c
#endif endif
endif endif
WEBSOCKETSSRCS = websockets.c ../common/md5.c ../common/sha1.c $(WEBSOCKETSSSLSRCS) WEBSOCKETSSRCS = websockets.c ../common/md5.c ../common/sha1.c $(WEBSOCKETSSSLSRCS)

Loading…
Cancel
Save