summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Beier <dontmind@freeshell.org>2011-10-04 17:28:26 +0200
committerChristian Beier <dontmind@freeshell.org>2011-10-04 17:28:26 +0200
commitabec0aa8c3e226682c684c9d8a0dab889815f511 (patch)
tree9682a211fcc6bf0c623730447184c648ec8a09ca
parent7c0aa2a0c0b8b6882110a08c19362da9c47913c7 (diff)
downloadlibvncserver-abec0aa8c3e226682c684c9d8a0dab889815f511.zip
libvncserver-abec0aa8c3e226682c684c9d8a0dab889815f511.tar.gz
This build warning is a libvncserver one, not for x11vnc.websockets
Also, make it warn more generally when no known encryption lib is available.
-rw-r--r--configure.ac31
1 files changed, 14 insertions, 17 deletions
diff --git a/configure.ac b/configure.ac
index a986912..90ce863 100644
--- a/configure.ac
+++ b/configure.ac
@@ -68,7 +68,6 @@ elif test "x$uname_s" = "xDarwin"; then
fi
# Check for OpenSSL
-
AH_TEMPLATE(HAVE_LIBCRYPT, [libcrypt library present])
AC_ARG_WITH(crypt,
[ --without-crypt disable support for libcrypt],,)
@@ -130,22 +129,6 @@ if test "x$with_ssl" != "xno"; then
fi
fi
AC_SUBST(SSL_LIBS)
-
- if test "x$HAVE_LIBSSL" != "xtrue" -a "x$with_ssl" != "xno"; then
- AC_MSG_WARN([
-==========================================================================
-*** The openssl encryption library libssl.so was not found. ***
-An x11vnc built this way will not support SSL encryption. To enable
-SSL install the necessary development packages (perhaps it is named
-something like libssl-dev) and run configure again.
-==========================================================================
-])
- sleep 5
- elif test "x$with_ssl" != "xno"; then
- AC_CHECK_LIB(ssl, X509_print_ex_fp,
- [AC_DEFINE(HAVE_X509_PRINT_EX_FP) HAVE_X509_PRINT_EX_FP="true"], , $SSL_LIBS
- )
- fi
AM_CONDITIONAL(HAVE_LIBSSL, test ! -z "$SSL_LIBS")
# Checks for X libraries
@@ -798,6 +781,20 @@ if test "x$with_gnutls" != "xno"; then
fi
AM_CONDITIONAL(HAVE_GNUTLS, test ! -z "$GNUTLS_LIBS")
+# warn if neither GnuTLS nor OpenSSL are available
+if test -z "$SSL_LIBS" -a -z "$GNUTLS_LIBS"; then
+ AC_MSG_WARN([
+==========================================================================
+*** No encryption library could be found. ***
+A libvncserver/libvncclient built this way will not support SSL encryption.
+To enable SSL install the necessary development packages (perhaps it is named
+something like libssl-dev or gnutls-dev) and run configure again.
+==========================================================================
+])
+ sleep 5
+fi
+
+
# IPv6
AH_TEMPLATE(IPv6, [Enable IPv6 support])
AC_ARG_WITH(ipv6,
OpenPOWER on IntegriCloud