From df85a9a0fd259d60b2392dc198ba4c4b42d828d8 Mon Sep 17 00:00:00 2001 From: Pieter Lexis Date: Thu, 21 Jan 2016 14:47:09 +0100 Subject: [PATCH] Fail configure when OpenSSL is not found --- configure.ac | 17 ++++++++--------- pdns/recursordist/configure.ac | 11 +++++------ 2 files changed, 13 insertions(+), 15 deletions(-) diff --git a/configure.ac b/configure.ac index 40084d853..b835602cb 100644 --- a/configure.ac +++ b/configure.ac @@ -104,17 +104,19 @@ AC_CHECK_HEADERS( [have_mmap=no] ) +PDNS_ENABLE_BOTAN +PDNS_WITH_CRYPTOPP +PDNS_CHECK_LIBSODIUM AX_CHECK_OPENSSL([ - AM_CONDITIONAL([OPENSSL], [true]) - AC_DEFINE(HAVE_OPENSSL, [1], [Define to 1 if you openssl]) - ],[ - AM_CONDITIONAL([OPENSSL], [false]) - ] + AM_CONDITIONAL([OPENSSL], [true]) + AC_DEFINE(HAVE_OPENSSL, [1], [Define to 1 if you openssl]) +],[ + AC_MSG_ERROR([OpenSSL not found]) + ] ) PDNS_CHECK_LIBEDIT PDNS_CHECK_RAGEL -PDNS_CHECK_LIBSODIUM PDNS_CHECK_CLOCK_GETTIME BOOST_REQUIRE([1.35]) @@ -141,7 +143,6 @@ AC_SUBST([LIBDL], [$lt_cv_dlopen_libs]) PDNS_CHECK_OS PDNS_ENABLE_VERBOSE_LOGGING -PDNS_ENABLE_BOTAN PDNS_ENABLE_PKCS11 PDNS_ENABLE_GSS_TSIG @@ -328,8 +329,6 @@ AC_CONFIG_FILES([ ext/Makefile ext/yahttp/Makefile ext/yahttp/yahttp/Makefile - ext/mbedtls/Makefile - ext/mbedtls/library/Makefile ext/json11/Makefile modules/bindbackend/Makefile modules/geoipbackend/Makefile diff --git a/pdns/recursordist/configure.ac b/pdns/recursordist/configure.ac index 8eab32438..55a639ff6 100644 --- a/pdns/recursordist/configure.ac +++ b/pdns/recursordist/configure.ac @@ -46,12 +46,11 @@ PDNS_ENABLE_VERBOSE_LOGGING # Crypto libraries PDNS_ENABLE_BOTAN AX_CHECK_OPENSSL([ - AM_CONDITIONAL([OPENSSL], [true]) - AC_DEFINE(HAVE_OPENSSL, [1], [Define to 1 if you openssl]) - ],[ - AM_CONDITIONAL([OPENSSL], [false]) - ] -) + AM_CONDITIONAL([OPENSSL], [true]) + AC_DEFINE(HAVE_OPENSSL, [1], [Define to 1 if you openssl]) +],[ + AC_MSG_ERROR([OpenSSL not found]) +]) # check for tools we might need PDNS_CHECK_RAGEL -- 2.40.0