From ec3dfe68934d4bacc5604ae7b601ab72e1fccc2f Mon Sep 17 00:00:00 2001
From: Pierre Ossman <ossman@cendio.se>
Date: Fri, 17 Oct 2014 10:36:58 +0200
Subject: Clean up GnuTLS linking and instructions

GnuTLS can have different crypto backends, and it is rarely gcrypt
these days. So we should not be including that unconditionally,
and should not be pointing people at it either. Also remove the
section about Win32 binaries as those are out of date and probably
insecure. Lastly remove the section about static builds as it is
a general issue and in no way complete with just the GnuTLS portions.
---
 cmake/Modules/FindGcrypt.cmake    | 36 ------------------------------------
 cmake/Modules/FindGpg_Error.cmake | 36 ------------------------------------
 2 files changed, 72 deletions(-)
 delete mode 100644 cmake/Modules/FindGcrypt.cmake
 delete mode 100644 cmake/Modules/FindGpg_Error.cmake

(limited to 'cmake/Modules')

diff --git a/cmake/Modules/FindGcrypt.cmake b/cmake/Modules/FindGcrypt.cmake
deleted file mode 100644
index 2158081a..00000000
--- a/cmake/Modules/FindGcrypt.cmake
+++ /dev/null
@@ -1,36 +0,0 @@
-# - Find gcrypt
-# Find the native GCRYPT includes and library
-#
-#  GCRYPT_FOUND - True if gcrypt found.
-#  GCRYPT_INCLUDE_DIR - where to find gcrypt.h, etc.
-#  GCRYPT_LIBRARIES - List of libraries when using gcrypt.
-
-if (GCRYPT_INCLUDE_DIR AND GCRYPT_LIBRARIES)
-  set(GCRYPT_FIND_QUIETLY TRUE)
-endif (GCRYPT_INCLUDE_DIR AND GCRYPT_LIBRARIES)
-
-# Include dir
-find_path(GCRYPT_INCLUDE_DIR
-	NAMES
-	  gcrypt.h
-)
-
-# Library
-find_library(GCRYPT_LIBRARY 
-  NAMES gcrypt
-)
-
-# handle the QUIETLY and REQUIRED arguments and set GCRYPT_FOUND to TRUE if 
-# all listed variables are TRUE
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(GCRYPT DEFAULT_MSG GCRYPT_LIBRARY GCRYPT_INCLUDE_DIR)
-
-IF(GCRYPT_FOUND)
-  SET( GCRYPT_LIBRARIES ${GCRYPT_LIBRARY} )
-ELSE(GCRYPT_FOUND)
-  SET( GCRYPT_LIBRARIES )
-ENDIF(GCRYPT_FOUND)
-
-# Lastly make it so that the GCRYPT_LIBRARY and GCRYPT_INCLUDE_DIR variables
-# only show up under the advanced options in the gui cmake applications.
-MARK_AS_ADVANCED( GCRYPT_LIBRARY GCRYPT_INCLUDE_DIR )
diff --git a/cmake/Modules/FindGpg_Error.cmake b/cmake/Modules/FindGpg_Error.cmake
deleted file mode 100644
index 2f1d3725..00000000
--- a/cmake/Modules/FindGpg_Error.cmake
+++ /dev/null
@@ -1,36 +0,0 @@
-# - Find gpg-error
-# Find the native GPG_ERROR includes and library
-#
-#  GPG_ERROR_FOUND - True if gpg-error found.
-#  GPG_ERROR_INCLUDE_DIR - where to find gpg-error.h, etc.
-#  GPG_ERROR_LIBRARIES - List of libraries when using gpg-error.
-
-if (GPG_ERROR_INCLUDE_DIR AND GPG_ERROR_LIBRARIES)
-  set(GPG_ERROR_FIND_QUIETLY TRUE)
-endif (GPG_ERROR_INCLUDE_DIR AND GPG_ERROR_LIBRARIES)
-
-# Include dir
-find_path(GPG_ERROR_INCLUDE_DIR
-	NAMES
-	  gpg-error.h
-)
-
-# Library
-find_library(GPG_ERROR_LIBRARY 
-  NAMES gpg-error
-)
-
-# handle the QUIETLY and REQUIRED arguments and set GPG_ERROR_FOUND to TRUE if 
-# all listed variables are TRUE
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(GPG_ERROR DEFAULT_MSG GPG_ERROR_LIBRARY GPG_ERROR_INCLUDE_DIR)
-
-IF(GPG_ERROR_FOUND)
-  SET( GPG_ERROR_LIBRARIES ${GPG_ERROR_LIBRARY} )
-ELSE(GPG_ERROR_FOUND)
-  SET( GPG_ERROR_LIBRARIES )
-ENDIF(GPG_ERROR_FOUND)
-
-# Lastly make it so that the GPG_ERROR_LIBRARY and GPG_ERROR_INCLUDE_DIR variables
-# only show up under the advanced options in the gui cmake applications.
-MARK_AS_ADVANCED( GPG_ERROR_LIBRARY GPG_ERROR_INCLUDE_DIR )
-- 
cgit v1.2.3