Revision: 4457
http://tigervnc.svn.sourceforge.net/tigervnc/?rev=4457&view=rev
Author: ossman_
Date: 2011-05-30 12:22:39 +0000 (Mon, 30 May 2011)
Log Message:
-----------
Reenable the automatic enabling of GnuTLS if present, but retain the ability
to explicitly disable it.
Modified Paths:
--------------
trunk/CMakeLists.txt
Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt 2011-05-28 14:24:19 UTC (rev 4456)
+++ trunk/CMakeLists.txt 2011-05-30 12:22:39 UTC (rev 4457)
@@ -208,25 +208,26 @@
endif()
# Check for GNUTLS library
-option(ENABLE_GNUTLS "Enable protocol encryption and advanced authentication")
+option(ENABLE_GNUTLS "Enable protocol encryption and advanced authentication"
ON)
if(ENABLE_GNUTLS)
- find_package(GnuTLS REQUIRED)
-
- include_directories(${GNUTLS_INCLUDE_DIR})
- add_definitions("-DHAVE_GNUTLS")
- add_definitions(${GNUTLS_DEFINITIONS})
-
- # Detect old version of GnuTLS
- set(CMAKE_EXTRA_INCLUDE_FILES gnutls/gnutls.h)
- set(CMAKE_REQUIRED_LIBRARIES gnutls)
- 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_EXTRA_INCLUDE_FILES)
- set(CMAKE_REQUIRED_LIBRARIES)
+ find_package(GnuTLS)
+ if (GNUTLS_FOUND)
+ include_directories(${GNUTLS_INCLUDE_DIR})
+ add_definitions("-DHAVE_GNUTLS")
+ add_definitions(${GNUTLS_DEFINITIONS})
+
+ # Detect old version of GnuTLS
+ set(CMAKE_EXTRA_INCLUDE_FILES gnutls/gnutls.h)
+ set(CMAKE_REQUIRED_LIBRARIES gnutls)
+ 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_EXTRA_INCLUDE_FILES)
+ set(CMAKE_REQUIRED_LIBRARIES)
+ endif()
endif()
# Check for socket functions
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
vRanger cuts backup time in half-while increasing security.
With the market-leading solution for virtual backup and recovery,
you get blazing-fast, flexible, and affordable data protection.
Download your free trial now.
http://p.sf.net/sfu/quest-d2dcopy1
_______________________________________________
Tigervnc-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tigervnc-commits
