From dba8b00194ea64d352c9fe3c6ee17f201307b5fc Mon Sep 17 00:00:00 2001 From: Daniel Salzman Date: Tue, 2 Dec 2025 11:56:17 +0100 Subject: [PATCH] redis: don't require GnuTLS for module building closes !1809 --- configure.ac | 2 ++ src/libknot/rrset-dump.c | 1 - src/redis/libs.h | 7 ++++++- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 1c0ee162bd..8e12bfed38 100644 --- 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 14f621a544..c410882394 100644 --- a/src/libknot/rrset-dump.c +++ b/src/libknot/rrset-dump.c @@ -14,7 +14,6 @@ #include #include -#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 a42e9a56db..c6ef6ea45c 100644 --- 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; +} -- 2.47.3