dnsdist: Add a configure option to disable CDB

diff --git a/pdns/dnsdistdist/configure.ac b/pdns/dnsdistdist/configure.ac
index eb1006f3b87911c900bbcc922e31a2ea116d0e43..65a44ac84057bf065c8d3a10a90d77b1a3b05536 100644 (file)
--- a/pdns/dnsdistdist/configure.ac
+++ b/pdns/dnsdistdist/configure.ac
@@ -98,7 +98,7 @@ AS_IF([test "x$enable_dns_over_https" != "xno"], [
 
 PDNS_WITH_NGHTTP2
 
-PDNS_CHECK_CDB
+DNSDIST_WITH_CDB
 PDNS_CHECK_LMDB
 PDNS_ENABLE_IPCIPHER
 

diff --git a/pdns/dnsdistdist/m4/dnsdist_with_cdb.m4 b/pdns/dnsdistdist/m4/dnsdist_with_cdb.m4
new file mode 100644 (file)
index 0000000..d874e2e
--- /dev/null
+++ b/pdns/dnsdistdist/m4/dnsdist_with_cdb.m4
@@ -0,0 +1,39 @@
+AC_DEFUN([DNSDIST_WITH_CDB], [
+  AC_MSG_CHECKING([whether we will we liniking with libcdb])
+  HAVE_CDB=0
+  AC_ARG_WITH([cdb],
+    AS_HELP_STRING([--with-cdb], [use CDB @<:@default=auto@:>@]),
+    [with_cdb=$withval],
+    [with_cdb=auto]
+  )
+  AC_MSG_RESULT([$with_cdb])
+
+  AS_IF([test "x$with_cdb" != "xno"], [
+    AS_IF([test "x$with_cdb" = "xyes" -o "x$with_cdb" = "xauto"], [
+      PKG_CHECK_MODULES([CDB], [libcdb], [
+        [HAVE_CDB=1]
+        AC_DEFINE([HAVE_CDB], [1], [Define to 1 if you have CDB])
+        ],
+        [AC_CHECK_HEADERS([cdb.h],
+          [AC_CHECK_LIB([cdb], [cdb_find],
+            [
+              CDB_LIBS="-lcdb"
+              AC_DEFINE([HAVE_CDB], [1], [Define to 1 if you have CDB])
+              [HAVE_CDB=1]
+            ],
+            [:]
+          )],
+          [:]
+        )]
+      )
+    ])
+  ])
+  AC_SUBST(CDB_LIBS)
+  AC_SUBST(CDB_CFLAGS)
+  AM_CONDITIONAL([HAVE_CDB], [test "x$CDB_LIBS" != "x"])
+  AS_IF([test "x$with_cdb" = "xyes"], [
+    AS_IF([test x"$CDB_LIBS" = "x"], [
+      AC_MSG_ERROR([CDB requested but libraries were not found])
+    ])
+  ])
+])

diff --git a/pdns/dnsdistdist/m4/pdns_check_cdb.m4 b/pdns/dnsdistdist/m4/pdns_check_cdb.m4
deleted file mode 120000 (symlink)
index 02cc194..0000000
--- a/pdns/dnsdistdist/m4/pdns_check_cdb.m4
+++ /dev/null
@@ -1 +0,0 @@
-../../../m4/pdns_check_cdb.m4
\ No newline at end of file