Merge branch '2348-bin-tools-mdig-compile-link-failure-because-of-missing-isccfg-dependency-3' into 'main'

Resolve "bin/tools/mdig: compile/link failure because of missing isccfg dependency"

Closes #2348

See merge request isc-projects/bind9!4497

bin/tools/Makefile.am

@@ -5,8 +5,8 @@ AM_CPPFLAGS +=			\
 	$(LIBDNS_CFLAGS)
 
 LDADD =				\
-	$(LIBISC_LIBS)		\
+	$(LIBDNS_LIBS)		\
-	$(LIBDNS_LIBS)
+	$(LIBISC_LIBS)
 
 bin_PROGRAMS =			\
 	arpaname		\
@@ -23,9 +23,10 @@ mdig_CPPFLAGS =			\
 	$(LIBBIND9_CFLAGS)
 
 mdig_LDADD =			\
-	$(LIBISC_LIBS)		\
+	$(LIBBIND9_LIBS)	\
+	$(LIBISCCFG_LIBS)	\
 	$(LIBDNS_LIBS)		\
-	$(LIBBIND9_LIBS)
+	$(LIBISC_LIBS)
 
 if HAVE_DNSTAP
 bin_PROGRAMS +=			\
@@ -37,8 +38,8 @@ dnstap_read_CPPFLAGS =		\
 	-I$(top_builddir)/lib/dns
 
 dnstap_read_LDADD =		\
-	$(LIBISC_LIBS)		\
 	$(LIBDNS_LIBS)		\
+	$(LIBISC_LIBS)		\
 	$(DNSTAP_LIBS)
 endif
 
@@ -52,7 +53,6 @@ named_nzd2nzf_CFLAGS =		\
 
 named_nzd2nzf_LDADD =		\
 	$(LIBISC_LIBS)		\
-	$(LIBDNS_LIBS)		\
 	$(LMDB_LIBS)
 
 endif

lib/bind9/Makefile.am

@@ -21,10 +21,10 @@ libbind9_la_CPPFLAGS =		\
 	$(LIBBIND9_CFLAGS)
 
 libbind9_la_LIBADD =		\
-	$(LIBISC_LIBS)		\
-	$(LIBDNS_LIBS)		\
 	$(LIBNS_LIBS)		\
-	$(LIBISCCFG_LIBS)
+	$(LIBISCCFG_LIBS)	\
+	$(LIBDNS_LIBS)		\
+	$(LIBISC_LIBS)
 
 libbind9_la_LDFLAGS =		\
 	$(AM_LDFLAGS)		\

lib/isccfg/Makefile.am

@@ -27,8 +27,8 @@ libisccfg_la_CPPFLAGS =			\
 	$(LIBDNS_CFLAGS)
 
 libisccfg_la_LIBADD =	\
-	$(LIBISC_LIBS)	\
+	$(LIBDNS_LIBS)	\
-	$(LIBDNS_LIBS)
+	$(LIBISC_LIBS)
 
 libisccfg_la_LDFLAGS =		\
 	$(AM_LDFLAGS)		\