Fail configure when OpenSSL is not found

diff --git a/configure.ac b/configure.ac
index 40084d85333ce1e3e2e70f4be969b8427fe8662c..b835602cb50e1ed47835b26ff1078b4ff482f40d 100644 (file)
--- 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 8eab32438ed4bd29caeb46fe7b902646dd4c45ec..55a639ff6f39be33887e67934338120364afab62 100644 (file)
--- 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