- Fix that configure --with-libhiredis also turns on cachedb.

git-svn-id: file:///svn/unbound/trunk@4674 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/configure b/configure
index b16b900c310d07b9df390feb6f2fc02397bc500a..fcb49c2debf05665c0b5aa22380cb32c39c726df 100755 (executable)
--- a/configure
+++ b/configure
@@ -20855,6 +20855,8 @@ if test "${enable_cachedb+set}" = set; then :
   enableval=$enable_cachedb;
 fi
 
+# turn on cachedb when hiredis support is enabled.
+if test "$found_libhiredis" = "yes"; then enable_cachedb="yes"; fi
 case "$enable_cachedb" in
     yes)
 

diff --git a/configure.ac b/configure.ac
index 2ba02602b814bafce7efc1f121cf80aa5b1933ce..11f2ff56cc59f9b8c658f4caeda6863ba9055184 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1489,6 +1489,8 @@ dnsc_DNSCRYPT([
 
 # check for cachedb if requested
 AC_ARG_ENABLE(cachedb, AC_HELP_STRING([--enable-cachedb], [enable cachedb module that can use external cache storage]))
+# turn on cachedb when hiredis support is enabled.
+if test "$found_libhiredis" = "yes"; then enable_cachedb="yes"; fi
 case "$enable_cachedb" in
     yes)
        AC_DEFINE([USE_CACHEDB], [1], [Define to 1 to use cachedb support])

diff --git a/doc/Changelog b/doc/Changelog
index d9d0f89ee494fe07851bf27f373bddcebb12d639..a4034b714c5f41755c2e84ccfd6aaaae97db1ca8 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,6 @@
+3 May 2018: Wouter
+       - Fix that configure --with-libhiredis also turns on cachedb.
+
 2 May 2018: Wouter
        - Fix fail to reject dead peers in forward-zone, with ssl-upstream.