From: DRC <dcommander@users.sourceforge.net>
Date: Tue, 7 Jun 2011 04:07:20 +0000 (+0000)
Subject: Fix detection of GnuTLS and its features when linking statically with an installation... 
X-Git-Tag: v1.1.90~312
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=17331b957009560b60218f8a18b114ab9400dd77;p=tigervnc.git

Fix detection of GnuTLS and its features when linking statically with an installation of GnuTLS installed in an arbitrary directory


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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ee206afc..176c236b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -224,14 +224,22 @@ if(ENABLE_GNUTLS)
     add_definitions(${GNUTLS_DEFINITIONS})
     
     # Detect old version of GnuTLS
+    set(CMAKE_REQUIRED_FLAGS -I${GNUTLS_INCLUDE_DIR})
     set(CMAKE_EXTRA_INCLUDE_FILES gnutls/gnutls.h)
-    set(CMAKE_REQUIRED_LIBRARIES gnutls)
+    set(CMAKE_REQUIRED_LIBRARIES ${GNUTLS_LIBRARIES})
+    if(ZLIB_FOUND)
+      # When we build against the static version of GnuTLS, we also use the
+      # included version of Zlib, but it isn't built yet, so we have to use the
+      # system's version (if available) to perform this test.
+      set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES};-lz)
+    endif()
     check_function_exists(gnutls_transport_set_global_errno HAVE_OLD_GNUTLS)
     check_function_exists(gnutls_x509_crt_print HAVE_GNUTLS_X509_CRT_PRINT)
     check_type_size(gnutls_x509_crt_t GNUTLS_X509_CRT_T)
     check_type_size(gnutls_datum_t GNUTLS_DATUM_T)
     check_type_size(gnutls_pk_algorithm_t GNUTLS_PK_ALGORITHM_T)
     check_type_size(gnutls_sign_algorithm_t GNUTLS_SIGN_ALGORITHM_T)
+    set(CMAKE_REQUIRED_FLAGS)
     set(CMAKE_EXTRA_INCLUDE_FILES) 
     set(CMAKE_REQUIRED_LIBRARIES)
   endif()