From df7997021e0f7ad99efa7f015b5c34f289538cfb Mon Sep 17 00:00:00 2001
From: Adam Tkac <atkac@redhat.com>
Date: Wed, 28 Apr 2010 15:45:53 +0000
Subject: [Bugfix] Compile VeNCrypt extension only when gnutls is enabled and
 available.

git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4049 3789f03b-4d11-0410-bbf8-ca57d06f2519
---
 configure.ac | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index bcd0b2d6..31779633 100644
--- a/configure.ac
+++ b/configure.ac
@@ -75,12 +75,15 @@ AC_ARG_ENABLE([gnutls],
 	[enable_gnutls="$enableval"], [enable_gnutls=yes])
 GNUTLS_CFLAGS=
 GNUTLS_LIBS=
-if test "$enable_gnutls" = yes; then
+if test "x$enable_gnutls" = xyes; then
 	PKG_CHECK_MODULES([gnutls], [gnutls >= 1.0.0],
 		[AC_DEFINE(HAVE_GNUTLS, 1, [GNUTLS available])], [])
 fi
 AC_SUBST([GNUTLS_CFLAGS], ["$gnutls_CFLAGS"])
 AC_SUBST([GNUTLS_LIBS], ["$gnutls_LIBS"])
+dnl If --enable-gnutls is passed and gnutls is not installed PKG_CHECK_MODULES
+dnl check above fails so it's safe to assume enable_gnutls == HAVE_GNUTLS
+AM_CONDITIONAL([HAVE_GNUTLS], [ test "x$enable_gnutls" = xyes ])
 
 VNCCONFIG_DIR='vncconfig'
 AC_ARG_ENABLE([vncconfig],
-- 
cgit v1.2.3