From 82711acd39e38b5f9fb128445dc95e280de9c7b6 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Fri, 12 Oct 2012 17:07:00 +0200 Subject: [PATCH] cmake: Fix building with gcrypt support. --- ConfigureChecks.cmake | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index f20fac99..988a3f62 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -81,13 +81,16 @@ if (CMAKE_HAVE_PTHREAD_H) set(HAVE_PTHREAD_H 1) endif (CMAKE_HAVE_PTHREAD_H) -if (HAVE_OPENSSL_EC_H AND HAVE_OPENSSL_ECDSA_H) - set(HAVE_OPENSSL_ECC 1) -endif (HAVE_OPENSSL_EC_H AND HAVE_OPENSSL_ECDSA_H) +if (NOT WITH_GCRYPT) + if (HAVE_OPENSSL_EC_H AND HAVE_OPENSSL_ECDSA_H) + set(HAVE_OPENSSL_ECC 1) + endif (HAVE_OPENSSL_EC_H AND HAVE_OPENSSL_ECDSA_H) + + if (HAVE_OPENSSL_ECC) + set(HAVE_ECC 1) + endif (HAVE_OPENSSL_ECC) +endif (NOT WITH_GCRYPT) -if (HAVE_OPENSSL_ECC) - set(HAVE_ECC 1) -endif (HAVE_OPENSSL_ECC) # FUNCTIONS check_function_exists(strncpy HAVE_STRNCPY)