Mercurial > hg > freeDiameter
changeset 802:6dde862ba119
Also detect GNUTLS version 3.1.x
| author | Sebastien Decugis <sdecugis@nict.go.jp> |
|---|---|
| date | Wed, 22 Aug 2012 00:16:25 +0200 |
| parents | 728cc60a7be5 |
| children | d5a4b5e175c2 |
| files | cmake/Modules/FindGnuTLS.cmake include/freeDiameter/freeDiameter-host.h.in |
| diffstat | 2 files changed, 6 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/cmake/Modules/FindGnuTLS.cmake Tue Aug 21 22:24:14 2012 +0200 +++ b/cmake/Modules/FindGnuTLS.cmake Wed Aug 22 00:16:25 2012 +0200 @@ -6,6 +6,7 @@ # GNUTLS_LIBRARIES - List of libraries when using gnutls. # GNUTLS_VERSION_210 - true if GnuTLS version is >= 2.10.0 (does not require additional separate gcrypt initialization) # GNUTLS_VERSION_300 - true if GnuTLS version is >= 3.00.0 (x509 verification functions changed) +# GNUTLS_VERSION_310 - true if GnuTLS version is >= 3.01.0 (stabilization branch with new APIs) if (GNUTLS_INCLUDE_DIR AND GNUTLS_LIBRARIES) set(GNUTLS_FIND_QUIETLY TRUE) @@ -43,14 +44,17 @@ IF(GNUTLS_FOUND) IF( NOT( "${GNUTLS_VERSION_TEST_FOR}" STREQUAL "${GNUTLS_LIBRARY}" )) INCLUDE (CheckLibraryExists) - MESSAGE(STATUS "Rechecking GNUTLS_VERSION_210 and GNUTLS_VERSION_300") + MESSAGE(STATUS "Checking GNUTLS version") UNSET(GNUTLS_VERSION_210) UNSET(GNUTLS_VERSION_210 CACHE) UNSET(GNUTLS_VERSION_300) UNSET(GNUTLS_VERSION_300 CACHE) + UNSET(GNUTLS_VERSION_310) + UNSET(GNUTLS_VERSION_310 CACHE) GET_FILENAME_COMPONENT(GNUTLS_PATH ${GNUTLS_LIBRARY} PATH) CHECK_LIBRARY_EXISTS(gnutls gnutls_hash ${GNUTLS_PATH} GNUTLS_VERSION_210) CHECK_LIBRARY_EXISTS(gnutls gnutls_x509_trust_list_verify_crt ${GNUTLS_PATH} GNUTLS_VERSION_300) + CHECK_LIBRARY_EXISTS(gnutls gnutls_handshake_set_timeout ${GNUTLS_PATH} GNUTLS_VERSION_310) SET( GNUTLS_VERSION_TEST_FOR ${GNUTLS_LIBRARY} CACHE INTERNAL "Version the test was made against" ) ENDIF (NOT( "${GNUTLS_VERSION_TEST_FOR}" STREQUAL "${GNUTLS_LIBRARY}" )) ENDIF(GNUTLS_FOUND)
--- a/include/freeDiameter/freeDiameter-host.h.in Tue Aug 21 22:24:14 2012 +0200 +++ b/include/freeDiameter/freeDiameter-host.h.in Wed Aug 22 00:16:25 2012 +0200 @@ -52,6 +52,7 @@ #cmakedefine DIAMID_IDNA_REJECT #cmakedefine GNUTLS_VERSION_210 #cmakedefine GNUTLS_VERSION_300 +#cmakedefine GNUTLS_VERSION_310 #cmakedefine ERRORS_ON_TODO #cmakedefine DEBUG