Commit abec0aa8 authored by Christian Beier's avatar Christian Beier

This build warning is a libvncserver one, not for x11vnc.

Also, make it warn more generally when no known encryption lib is
available.
parent 7c0aa2a0
...@@ -68,7 +68,6 @@ elif test "x$uname_s" = "xDarwin"; then ...@@ -68,7 +68,6 @@ elif test "x$uname_s" = "xDarwin"; then
fi fi
# Check for OpenSSL # Check for OpenSSL
AH_TEMPLATE(HAVE_LIBCRYPT, [libcrypt library present]) AH_TEMPLATE(HAVE_LIBCRYPT, [libcrypt library present])
AC_ARG_WITH(crypt, AC_ARG_WITH(crypt,
[ --without-crypt disable support for libcrypt],,) [ --without-crypt disable support for libcrypt],,)
...@@ -130,22 +129,6 @@ if test "x$with_ssl" != "xno"; then ...@@ -130,22 +129,6 @@ if test "x$with_ssl" != "xno"; then
fi fi
fi fi
AC_SUBST(SSL_LIBS) 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") AM_CONDITIONAL(HAVE_LIBSSL, test ! -z "$SSL_LIBS")
# Checks for X libraries # Checks for X libraries
...@@ -798,6 +781,20 @@ if test "x$with_gnutls" != "xno"; then ...@@ -798,6 +781,20 @@ if test "x$with_gnutls" != "xno"; then
fi fi
AM_CONDITIONAL(HAVE_GNUTLS, test ! -z "$GNUTLS_LIBS") 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 # IPv6
AH_TEMPLATE(IPv6, [Enable IPv6 support]) AH_TEMPLATE(IPv6, [Enable IPv6 support])
AC_ARG_WITH(ipv6, AC_ARG_WITH(ipv6,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment