From 58a8df6ff2bffa46d96b057603c93d824f1c8591 Mon Sep 17 00:00:00 2001 From: Vic Lee Date: Thu, 1 Oct 2009 20:22:36 +0800 Subject: Add anonymous TLS support in libvncclient Signed-off-by: Vic Lee --- configure.ac | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 65e258c..7b45157 100644 --- a/configure.ac +++ b/configure.ac @@ -667,6 +667,22 @@ if test ! -z "$MINGW"; then fi AC_SUBST(WSOCKLIB) +# Checks for GnuTLS +AH_TEMPLATE(WITH_CLIENT_TLS, [Enable support for gnutls in libvncclient]) +AC_ARG_WITH(gnutls, +[ --without-gnutls disable support for gnutls],,) +AC_ARG_WITH(client-tls, +[ --without-client-tls disable support for gnutls in libvncclient],,) + +if test "x$with_gnutls" != "xno"; then + PKG_CHECK_MODULES(GNUTLS, gnutls >= 2.8.0) + CFLAGS="$CFLAGS $GNUTLS_CFLAGS" + LIBS="$LIBS $GNUTLS_LIBS" + if test "x$with_client_tls" != "xno"; then + AC_DEFINE(WITH_CLIENT_TLS) + fi +fi + # Checks for header files. AC_HEADER_STDC AC_CHECK_HEADERS([arpa/inet.h fcntl.h netdb.h netinet/in.h stdlib.h string.h sys/socket.h sys/time.h sys/timeb.h syslog.h unistd.h]) -- cgit v1.2.1 From 68964c29d97b9b9d9d5bfbe685eb05c3c17c5fd1 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Fri, 2 Oct 2009 11:11:28 +0200 Subject: Fallback to --without-client-tls if GNUTLS could not be found Signed-off-by: Johannes Schindelin --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 7b45157..a45bbf2 100644 --- a/configure.ac +++ b/configure.ac @@ -675,7 +675,7 @@ AC_ARG_WITH(client-tls, [ --without-client-tls disable support for gnutls in libvncclient],,) if test "x$with_gnutls" != "xno"; then - PKG_CHECK_MODULES(GNUTLS, gnutls >= 2.8.0) + PKG_CHECK_MODULES(GNUTLS, gnutls >= 2.8.0, , with_client_tls=no) CFLAGS="$CFLAGS $GNUTLS_CFLAGS" LIBS="$LIBS $GNUTLS_LIBS" if test "x$with_client_tls" != "xno"; then -- cgit v1.2.1