Remove just enough entries from the cache, not one more than asked

[thirdparty/pdns.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 98d6f4fc50fa57fef43d4a40bbece97ed012ecc9..a5a597cbf799d9908ef57233e5100e8ee07b58fa 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -41,6 +41,8 @@ AC_DEFINE([_GNU_SOURCE], [1],
 # Warn when pkg.m4 is missing
 m4_pattern_forbid([^_?PKG_[A-Z_]+$], [*** pkg.m4 missing, please install pkg-config])
 
+PDNS_CHECK_OS
+
 PDNS_WITH_LUAJIT
 AS_IF([test "x$with_luajit" = "xno"], [
   PDNS_WITH_LUA
@@ -93,6 +95,7 @@ AC_CHECK_HEADERS(
 
 PDNS_ENABLE_BOTAN
 PDNS_CHECK_LIBSODIUM
+PDNS_CHECK_LIBDECAF
 PDNS_CHECK_LIBCRYPTO([
 ],[
    AC_MSG_ERROR([OpenSSL/libcrypto not found])
@@ -131,11 +134,17 @@ AS_IF([test "x$lt_cv_dlopen" = "xno"],
 
 AC_SUBST([LIBDL], [$lt_cv_dlopen_libs])
 
-PDNS_CHECK_OS
 PDNS_ENABLE_VERBOSE_LOGGING
 PDNS_ENABLE_PKCS11
 PDNS_ENABLE_GSS_TSIG
 
+AC_SUBST([socketdir])
+socketdir="/var/run"
+AC_ARG_WITH([socketdir],
+  [AS_HELP_STRING([--with-socketdir], [where the controlsocket lives @<:@default=/var/run@:>@])],
+  [socketdir="$withval"]
+)
+
 modules="bind gmysql random"
 AC_ARG_WITH([modules],
   [AS_HELP_STRING([--with-modules], [which backends to compile with @<:@default=bind gmysql random@:>@])],
@@ -148,29 +157,13 @@ AC_ARG_WITH([dynmodules],
   [dynmodules="$withval"]
 )
 
-AC_SUBST([socketdir])
-socketdir="/var/run"
-AC_ARG_WITH([socketdir],
-  [AS_HELP_STRING([--with-socketdir], [where the controlsocket lives @<:@default=/var/run@:>@])],
-  [socketdir="$withval"]
-)
-
 AC_SUBST([moduledirs])
 AC_SUBST([moduleobjects])
 AC_SUBST([modulelibs])
 AC_DEFINE_UNQUOTED([PDNS_MODULES], "$modules", [Built-in modules])
 
-AC_MSG_CHECKING([whether we will be building and installing the extra tools])
-AC_ARG_ENABLE([tools],
-  [AS_HELP_STRING([--enable-tools], [if we should build and install the tools @<:@default=no@:>@])],
-  [enable_tools=$enableval],
-  [enable_tools=no]
-)
-
-AC_MSG_RESULT([$enable_tools])
-AM_CONDITIONAL([TOOLS], [test "x$enable_tools" != "xno"])
-
-PDNS_WITH_PROTOBUF
+AS_IF([test x"$modules" = "xno"], [modules=""])
+AS_IF([test x"$dynmodules" = "xno"], [dynmodules=""])
 
 for a in $modules $dynmodules; do
   case "$a" in
@@ -213,7 +206,7 @@ for a in $modules $dynmodules; do
       AS_IF([test "x$with_lua" = "xno"],
         AC_MSG_ERROR([Lua backend needs lua, run ./configure --with-lua])
       )
-      AS_IF([test "x$LUAPC" = "x"],
+      AS_IF([test "x$LUAPC" = "x" -a "x$LUAJITPC" = "x"],
         AC_MSG_ERROR([Lua backend needs lua but we cannot find it])
       )
       ;;
@@ -222,6 +215,19 @@ done
 
 PDNS_ENABLE_REMOTEBACKEND_ZEROMQ
 
+AC_MSG_CHECKING([whether we will be building and installing the extra tools])
+AC_ARG_ENABLE([tools],
+  [AS_HELP_STRING([--enable-tools], [if we should build and install the tools @<:@default=no@:>@])],
+  [enable_tools=$enableval],
+  [enable_tools=no]
+)
+
+AC_MSG_RESULT([$enable_tools])
+AM_CONDITIONAL([TOOLS], [test "x$enable_tools" != "xno"])
+
+PDNS_WITH_PROTOBUF
+
+
 AM_CONDITIONAL([ORACLE], [test "x$needoracle" = "xyes"])
 
 AM_CONDITIONAL([LDAP], [test "x$needldap" = "xyes"])
@@ -339,10 +345,18 @@ AC_MSG_NOTICE([----------------])
 AC_MSG_NOTICE([Built-in modules: $modules])
 AC_MSG_NOTICE([Dynamic modules: $dynmodules])
 AC_MSG_NOTICE([])
-AS_IF([test "x$libcrypto_ecdsa" == "xyes"],
+AS_IF([test "x$libcrypto_ecdsa" = "xyes"],
   [AC_MSG_NOTICE([OpenSSL ecdsa: yes])],
   [AC_MSG_NOTICE([OpenSSL ecdsa: no])]
 )
+AS_IF([test "x$LIBSODIUM_LIBS" != "x" || test "x$LIBDECAF_LIBS" != "x"],
+  [AC_MSG_NOTICE([ed25519: yes])],
+  [AC_MSG_NOTICE([ed25519: no])]
+)
+AS_IF([test "x$LIBDECAF_LIBS" != "x"],
+  [AC_MSG_NOTICE([ed448: yes])],
+  [AC_MSG_NOTICE([ed448: no])]
+)
 AS_IF([test "x$needsqlite3" != "x"],
   [AC_MSG_NOTICE([SQLite3: yes])],
   [AC_MSG_NOTICE([SQLite3: no])]