From 6db5088e17a318aa1140c068716718f376459a88 Mon Sep 17 00:00:00 2001
From: Michal Nowak <mnowak@isc.org>
Date: Mon, 23 Nov 2020 14:59:12 +0100
Subject: [PATCH 1/3] Remove AC_SUBST() calls from AX_LIB_LMDB()

LMDB build variables are already substituted by AC_SUBST() calls in
configure.ac and therefore the latter should not be duplicated in the
AX_LIB_LMDB() helper macro.
---
 m4/ax_lib_lmdb.m4 | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/m4/ax_lib_lmdb.m4 b/m4/ax_lib_lmdb.m4
index 2d011dc7cd..0b1c5662c5 100644
--- a/m4/ax_lib_lmdb.m4
+++ b/m4/ax_lib_lmdb.m4
@@ -12,11 +12,6 @@
 #
 #   This macro takes only one argument, a path to the lmdb headers and library.
 #
-#   This macro calls:
-#
-#     AC_SUBST(LMDB_CFLAGS)
-#     AC_SUBST(LMDB_LDFLAGS)
-#
 # LICENSE
 #
 #   Copyright (c) 2020 Internet Systems Consortium
@@ -42,8 +37,6 @@ AC_DEFUN([AX_LIB_LMDB],
 		 LIBS="$LIBS $LMDB_LIBS"
 		 AC_SEARCH_LIBS([mdb_env_create], [lmdb],
 				[LMDB_LIBS="$LMDB_LIBS $ac_cv_search_mdb_env_create"
-				 AC_SUBST([LMDB_CFLAGS])
-				 AC_SUBST([LMDB_LDFLAGS])
 				 AX_RESTORE_FLAGS([lmdb])
 				 $2
 				],

From ef18d9251e6f82f0ad3196ad7295594280f50afd Mon Sep 17 00:00:00 2001
From: Michal Nowak <mnowak@isc.org>
Date: Mon, 23 Nov 2020 15:07:56 +0100
Subject: [PATCH 2/3] Remove unused DLZ_DRIVER_MYSQL_* build variables

The DLZ_DRIVER_MYSQL_INCLUDES and DLZ_DRIVER_MYSQL_LIBS build variables
are not used anywhere.  Remove their definitions and the associated
AC_SUBST() calls.
---
 configure.ac | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 4e5332750e..9d6f57a9ee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1456,8 +1456,6 @@ DLZ_DRIVER_LIBS=""
 DLZ_DRIVER_SRCS=""
 DLZ_DRIVER_OBJS=""
 DLZ_SYSTEM_TEST=""
-DLZ_DRIVER_MYSQL_INCLUDES=""
-DLZ_DRIVER_MYSQL_LIBS=""
 
 #
 #
@@ -1560,8 +1558,6 @@ AS_IF([test "$enable_dnsrps" != "no"],[
 # AC_SUBST(DLZ_DRIVER_SRCS)
 # AC_SUBST(DLZ_DRIVER_OBJS)
 # AC_SUBST(DLZ_SYSTEM_TEST)
-# AC_SUBST(DLZ_DRIVER_MYSQL_INCLUDES)
-# AC_SUBST(DLZ_DRIVER_MYSQL_LIBS)
 # AC_SUBST_FILE(DLZ_DRIVER_RULES)
 # this ensures the configure summary report comes out right
 test -z "$with_dlz_bdb" && with_dlz_bdb=no

From f8d155a9ef5ed1037156e573a8438e6ba40ddd80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= <michal@isc.org>
Date: Tue, 24 Nov 2020 14:51:51 +0100
Subject: [PATCH 3/3] Refactor libidn2 detection code

Make the code block handling the --with-libidn2=/path/to/libidn2 form of
the --with-libidn2 build-time option behave more similarly to the
PKG_CHECK_MODULES() macro.
---
 configure.ac | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/configure.ac b/configure.ac
index 9d6f57a9ee..625bc08b08 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1305,7 +1305,6 @@ AC_SUBST(CURL)
 #
 
 LIBIDN2_CFLAGS=
-LIBIDN2_LDFLAGS=
 LIBIDN2_LIBS=
 
 # [pairwise: --with-libidn2=yes, --without-libidn2]
@@ -1318,20 +1317,18 @@ AS_CASE([$with_libidn2],
 	[no],	[],
 	[*],	[AX_SAVE_FLAGS([libidn2])
 		 LIBIDN2_CFLAGS="-I$with_libidn2/include"
-		 LIBIDN2_LDFLAGS="-L$with_libidn2/lib"
-		 CFLAGS="$LIBIDN2_CFLAGS $CFLAGS"
-		 CPPFLAGS="$LIBIDN2_CFLAGS $CPPFLAGS"
-		 LDFLAGS="$LIBIDN2_LDFLAGS $LDFLAGS"
+		 LIBIDN2_LIBS="-L$with_libidn2/lib"
+		 CFLAGS="$CFLAGS $LIBIDN2_CFLAGS"
+		 LIBS="$LIBS $LIBIDN2_LIBS"
 		 AC_CHECK_HEADERS([idn2.h],
 				  [],
 				  [AC_MSG_ERROR([idn2.h not found])])
 		 AC_SEARCH_LIBS([idn2_to_ascii_lz], [idn2],
-				[LIBIDN2_LIBS="$ac_cv_search_idn2_to_ascii_lz"
+				[LIBIDN2_LIBS="$LIBIDN2_LIBS $ac_cv_search_idn2_to_ascii_lz"
 				 AC_DEFINE([HAVE_LIBIDN2], [1], [Define if libidn2 was found])],
 				[AC_MSG_ERROR([libidn2 requested, but not found])])
 		AX_RESTORE_FLAGS([libidn2])])
 AC_SUBST([LIBIDN2_CFLAGS])
-AC_SUBST([LIBIDN2_LDFLAGS])
 AC_SUBST([LIBIDN2_LIBS])
 
 #