From: Pierre Ossman <ossman@cendio.se>
Date: Fri, 27 May 2011 11:50:58 +0000 (+0000)
Subject: Make use of GnuTLS an explicit choice to avoid surprises if it gets included
X-Git-Tag: v1.1.90~323
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=32c88c4b0261662da7005d271ebe7a02e936146f;p=tigervnc.git

Make use of GnuTLS an explicit choice to avoid surprises if it gets included
or not.


git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4455 3789f03b-4d11-0410-bbf8-ca57d06f2519
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f3cb208c..2c25fb1c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -208,8 +208,10 @@ if(BUILD_NEW_VNCVIEWER)
 endif()
 
 # Check for GNUTLS library
-find_package(GnuTLS)
-if(GNUTLS_FOUND)
+option(ENABLE_GNUTLS "Enable protocol encryption and advanced authentication")
+if(ENABLE_GNUTLS)
+  find_package(GnuTLS REQUIRED)
+
   include_directories(${GNUTLS_INCLUDE_DIR})
   add_definitions("-DHAVE_GNUTLS")
   add_definitions(${GNUTLS_DEFINITIONS})