From: Willem Toorop <willem@nlnetlabs.nl>
Date: Tue, 18 Nov 2025 14:01:05 +0000 (+0100)
Subject: Fix for issue raised in PR #200
X-Git-Tag: 1.9.0-rc.1~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2119ebe6a6ed14372c4465df669bfa29cc34a797;p=thirdparty%2Fldns.git

Fix for issue raised in PR #200
---

diff --git a/Changelog b/Changelog
index 2126ab8b..0c311955 100644
--- a/Changelog
+++ b/Changelog
@@ -36,6 +36,8 @@
 	  Thanks duthils
 	* Fix #283: ldns-walk fails after update from 1.8.3 to 1.8.4
 	  Thanks jschauma
+	* PR #200: Allow compiled tests to link to ldns statically via
+	  environment variable. Thanks FGasper and pemensik
 
 1.8.4	2024-07-19
 	* Fix building documentation in build directory.
diff --git a/test/12-unit-tests-dnssec.tpkg/12-unit-tests-dnssec.Makefile.in b/test/12-unit-tests-dnssec.tpkg/12-unit-tests-dnssec.Makefile.in
index ed01b268..be8fab7f 100644
--- a/test/12-unit-tests-dnssec.tpkg/12-unit-tests-dnssec.Makefile.in
+++ b/test/12-unit-tests-dnssec.tpkg/12-unit-tests-dnssec.Makefile.in
@@ -14,7 +14,8 @@ CC = @CC@
 CFLAGS = @CFLAGS@
 CPPFLAGS = @CPPFLAGS@ @LIBSSL_CPPFLAGS@ -I../..
 LDFLAGS = @LDFLAGS@ @LIBSSL_LDFLAGS@ -L../../.libs
-LIBS = @LIBS@ @LIBSSL_SSL_LIBS@ -lldns
+LDNS_LIBS ?= -lldns
+LIBS = @LIBS@ @LIBSSL_SSL_LIBS@ $(LDNS_LIBS)
 
 # Hmmm gcc 4.6.1 expects $(LIBS) as the last argument
 
diff --git a/test/13-unit-tests-base.tpkg/13-unit-tests-base.Makefile.in b/test/13-unit-tests-base.tpkg/13-unit-tests-base.Makefile.in
index 6afccf98..fb0c7719 100644
--- a/test/13-unit-tests-base.tpkg/13-unit-tests-base.Makefile.in
+++ b/test/13-unit-tests-base.tpkg/13-unit-tests-base.Makefile.in
@@ -14,7 +14,8 @@ CC = @CC@
 CFLAGS = @CFLAGS@
 CPPFLAGS = @CPPFLAGS@ @LIBSSL_CPPFLAGS@ -I../..
 LDFLAGS = @LDFLAGS@ @LIBSSL_LDFLAGS@ -L../../.libs
-LIBS = @LIBS@ @LIBSSL_SSL_LIBS@ -lldns
+LDNS_LIBS ?= -lldns
+LIBS = @LIBS@ @LIBSSL_SSL_LIBS@ $(LDNS_LIBS)
 
 COMPILE         = $(CC) $(CPPFLAGS) $(CFLAGS)
 LINK            = $(CC) $(CFLAGS) $(LDFLAGS)
diff --git a/test/15-unit-tests-rrtypes.tpkg/15-unit-tests-rrtypes.Makefile.in b/test/15-unit-tests-rrtypes.tpkg/15-unit-tests-rrtypes.Makefile.in
index 99b8aca9..5fbb0e37 100644
--- a/test/15-unit-tests-rrtypes.tpkg/15-unit-tests-rrtypes.Makefile.in
+++ b/test/15-unit-tests-rrtypes.tpkg/15-unit-tests-rrtypes.Makefile.in
@@ -14,7 +14,8 @@ CC = @CC@
 CFLAGS = @CFLAGS@
 CPPFLAGS = @CPPFLAGS@ @LIBSSL_CPPFLAGS@ -I../..
 LDFLAGS = @LDFLAGS@ @LIBSSL_LDFLAGS@ -L../../.libs
-LIBS = @LIBS@ @LIBSSL_SSL_LIBS@ -lldns
+LDNS_LIBS ?= -lldns
+LIBS = @LIBS@ @LIBSSL_SSL_LIBS@ $(LDNS_LIBS)
 
 COMPILE         = $(CC) $(CPPFLAGS) $(CFLAGS)
 LINK            = $(CC) $(CFLAGS) $(LDFLAGS)
diff --git a/test/16-unit-tests-edns.tpkg/16-unit-tests-edns.Makefile.in b/test/16-unit-tests-edns.tpkg/16-unit-tests-edns.Makefile.in
index 459e9e35..7119b469 100644
--- a/test/16-unit-tests-edns.tpkg/16-unit-tests-edns.Makefile.in
+++ b/test/16-unit-tests-edns.tpkg/16-unit-tests-edns.Makefile.in
@@ -14,7 +14,8 @@ CC = @CC@
 CFLAGS = @CFLAGS@
 CPPFLAGS = @CPPFLAGS@ @LIBSSL_CPPFLAGS@ -I../..
 LDFLAGS = @LDFLAGS@ @LIBSSL_LDFLAGS@ -L../../.libs
-LIBS = @LIBS@ @LIBSSL_SSL_LIBS@ -lldns
+LDNS_LIBS ?= -lldns
+LIBS = @LIBS@ @LIBSSL_SSL_LIBS@ $(LDNS_LIBS)
 
 COMPILE         = $(CC) $(CPPFLAGS) $(CFLAGS)
 LINK            = $(CC) $(CFLAGS) $(LDFLAGS)