Merge branch 'michal/fix-libdns-cflags' into 'main'

Fix libdns CFLAGS

See merge request isc-projects/bind9!3759

Makefile.top

@@ -42,6 +42,16 @@ LIBDNS_CFLAGS = \
 LIBDNS_LIBS = \
 	$(top_builddir)/lib/dns/libdns.la
 
+if HAVE_DNSTAP
+LIBDNS_CFLAGS +=					\
+	$(DNSTAP_CFLAGS)
+endif HAVE_DNSTAP
+
+if HAVE_LMDB
+LIBDNS_CFLAGS +=					\
+	$(LMDB_CFLAGS)
+endif HAVE_LMDB
+
 LIBNS_CFLAGS = \
 	-I$(top_srcdir)/lib/ns/include
 

m4/ax_lib_lmdb.m4

@@ -37,22 +37,21 @@ AC_DEFUN([AX_LIB_LMDB],
 		[AC_MSG_RESULT([yes])
 		 LMDB_CFLAGS="-I$1/include"
 		 LMDB_LIBS="-L$1/lib"
-		 saved_CFLAGS="$CFLAGS"
-		 saved_LIBS="$LIBS"
+		 AX_SAVE_FLAGS([lmdb])
 		 CFLAGS="$CFLAGS $LMDB_CFLAGS"
 		 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
 				],
 				[AC_MSG_RESULT([no])
 				 LMDB_CFLAGS=""
 				 LMDB_LIBS=""
+				 AX_RESTORE_FLAGS([lmdb])
 				 $3
 				])
-		 CFLAGS="$saved_CFLAGS"
-		 LIBS="$saved_LIBS"
 		],
 		[AC_MSG_RESULT([no])])])