From b6b33d0f48f7a112b2547358eda988bf2082dc0e Mon Sep 17 00:00:00 2001
From: Mark Andrews <marka@isc.org>
Date: Fri, 8 Sep 2017 12:52:48 +1000
Subject: [PATCH] ISCLIBS should be after DNSLIBS

---
 bin/rndc/Makefile.in         | 2 +-
 bin/tools/Makefile.in        | 2 +-
 lib/isccfg/tests/Makefile.in | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/bin/rndc/Makefile.in b/bin/rndc/Makefile.in
index 07909ddab5..eb6ff4fb65 100644
--- a/bin/rndc/Makefile.in
+++ b/bin/rndc/Makefile.in
@@ -61,7 +61,7 @@ rndc.@O@: rndc.c
 
 rndc@EXEEXT@: rndc.@O@ util.@O@ ${RNDCDEPLIBS}
 	export BASEOBJS="rndc.@O@ util.@O@"; \
-	export LIBS0="${ISCCFGLIBS} ${ISCCCLIBS} ${BIND9LIBS} ${ISCLIBS} ${DNSLIBS}"; \
+	export LIBS0="${ISCCFGLIBS} ${ISCCCLIBS} ${BIND9LIBS} ${DNSLIBS} ${ISCLIBS}"; \
 	${FINALBUILDCMD}
 
 doc man:: ${MANOBJS}
diff --git a/bin/tools/Makefile.in b/bin/tools/Makefile.in
index 1180d61d17..9c985a3379 100644
--- a/bin/tools/Makefile.in
+++ b/bin/tools/Makefile.in
@@ -78,7 +78,7 @@ named-rrchecker@EXEEXT@: named-rrchecker.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
 
 nsec3hash@EXEEXT@: nsec3hash.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS}
 	export BASEOBJS="nsec3hash.@O@"; \
-	export LIBS0="${ISCLIBS} ${DNSLIBS}"; \
+	export LIBS0="${DNSLIBS} ${ISCLIBS}"; \
 	${FINALBUILDCMD}
 
 isc-hmac-fixup@EXEEXT@: isc-hmac-fixup.@O@ ${ISCDEPLIBS}
diff --git a/lib/isccfg/tests/Makefile.in b/lib/isccfg/tests/Makefile.in
index fee8a7a793..e418be7364 100644
--- a/lib/isccfg/tests/Makefile.in
+++ b/lib/isccfg/tests/Makefile.in
@@ -40,8 +40,8 @@ TARGETS =	parser_test@EXEEXT@
 
 parser_test@EXEEXT@: parser_test.@O@ ${ISCDEPLIBS} ${DNSDEPLIBS} ${ISCCFGDEPLIBS}
 	${LIBTOOL_MODE_LINK} ${PURIFY} ${CC} ${CFLAGS} ${LDFLAGS} -o $@ \
-			parser_test.@O@ ${ISCCFGLIBS} ${ISCLIBS} \
-				${DNSLIBS} ${LIBS}
+			parser_test.@O@ ${ISCCFGLIBS} ${DNSLIBS} \
+		        ${ISCLIBS} ${LIBS}
 
 unit::
 	sh ${top_srcdir}/unit/unittest.sh