redis: don't require GnuTLS for module building

closes !1809

diff --git a/configure.ac b/configure.ac
index 1c0ee162bdb17a9981e2ae749c276fc3fa5e1c57..8e12bfed3886e0b3d31bf529a77573b7f9efb3a3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -167,6 +167,8 @@ PKG_CHECK_MODULES([gnutls], [gnutls >= 3.6.10], [
 
     CFLAGS=$save_CFLAGS
     LIBS=$save_LIBS
+], [
+    AS_IF([test "$enable_redis" != "module"], [AC_MSG_ERROR([GnuTLS library not found])])
 ])
 AM_CONDITIONAL([ENABLE_PKCS11], [test "$enable_pkcs11" = "yes"])
 

diff --git a/src/libknot/rrset-dump.c b/src/libknot/rrset-dump.c
index 14f621a5444839f88e6c504053124eabab3a1664..c410882394f298c5cb1d7d7a28a37d674a61fa65 100644 (file)
--- a/src/libknot/rrset-dump.c
+++ b/src/libknot/rrset-dump.c
@@ -14,7 +14,6 @@
 #include <netinet/in.h>
 #include <sys/socket.h>
 
-#include "libknot/dnssec/binary.h"
 #include "libknot/dnssec/key.h"
 #include "libknot/dnssec/keytag.h"
 #include "libknot/attribute.h"

diff --git a/src/redis/libs.h b/src/redis/libs.h
index a42e9a56db8763fd53186775f116f4b401162fd4..c6ef6ea45c791ecbf3ce02d9875be5cc933758de 100644 (file)
--- a/src/redis/libs.h
+++ b/src/redis/libs.h
@@ -19,7 +19,6 @@
 #include "contrib/string.c"
 #include "contrib/time.c"
 #include "contrib/ucw/mempool.c"
-#include "libknot/dnssec/key/keytag.c"
 #include "libknot/codes.c"
 #include "libknot/descriptor.c"
 #include "libknot/dname.c"
@@ -33,3 +32,9 @@
 #include "libzscanner/error.c"
 #include "libzscanner/functions.c"
 #include "libzscanner/scanner.c.t0"
+
+// Add a dummy symbol for unused but called function in rrset-dump.c.
+int dnssec_keytag(const dnssec_binary_t *rdata, uint16_t *keytag)
+{
+       return KNOT_ENOTSUP;
+}