Fix for issue raised in PR #200

diff --git a/Changelog b/Changelog
index 2126ab8b22757884be5067969c3a2dae6e5fb290..0c31195516b740c913231ee6fd184f3e63588874 100644 (file)
--- 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 ed01b2681ce193d10bebabd943b69479dbcabce8..be8fab7f4287ac129e16ab376df898ac9a3441c4 100644 (file)
--- 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 6afccf9848dff0b18af1e83692a73abe92b8e0db..fb0c77197e7f02a63a9b0be5cdfbe6c0dfd974d5 100644 (file)
--- 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 99b8aca946739ee8aee7e6729a8f6105b350b678..5fbb0e3734ae7bdfd09a28b96155e04521ac0198 100644 (file)
--- 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 459e9e35ccd04cc08c390e7309c0b0659c728221..7119b469c972a815677d9e6db4c5147445184f64 100644 (file)
--- 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)