Merge branch '1044-fix-LFS-flags-on-BSDs-v9_14' into 'v9_14'

Pull the values for LFS_{CFLAGS,LDFLAGS,LIBS} from autoconf instead using them directly in make

See merge request isc-projects/bind9!1979

configure

@@ -804,6 +804,9 @@ FGREP
 SED
 LIBTOOL
 SET_MAKE
+LFS_LIBS
+LFS_LDFLAGS
+LFS_CFLAGS
 EGREP
 GREP
 CPP
@@ -3895,6 +3898,14 @@ $as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
 
 
 
+LFS_CFLAGS=`getconf LFS_CFLAGS 2>/dev/null`
+LFS_LDFLAGS=`getconf LFS_LDFLAGS 2>/dev/null`
+LFS_LIBS=`getconf LFS_LIBS 2>/dev/null`
+
+
+
+
+
 # Enable RFC 3542 APIs on macOS
 
 $as_echo "#define __APPLE_USE_RFC_3542 1" >>confdefs.h

configure.ac

@@ -16,6 +16,14 @@ AC_CONFIG_MACRO_DIR([m4])
 AC_CANONICAL_HOST
 AC_USE_SYSTEM_EXTENSIONS
 
+LFS_CFLAGS=`getconf LFS_CFLAGS 2>/dev/null`
+LFS_LDFLAGS=`getconf LFS_LDFLAGS 2>/dev/null`
+LFS_LIBS=`getconf LFS_LIBS 2>/dev/null`
+
+AC_SUBST([LFS_CFLAGS])
+AC_SUBST([LFS_LDFLAGS])
+AC_SUBST([LFS_LIBS])
+
 # Enable RFC 3542 APIs on macOS
 AC_DEFINE([__APPLE_USE_RFC_3542], [1], [Select RFC3542 IPv6 API on macOS])
 

lib/dns/Makefile.in

@@ -167,9 +167,6 @@ include/dns/rdatastruct.h: gen \
 code.h:	gen
 	./gen -s ${srcdir} > code.h || { rm -f $@ ; exit 1; }
 
-gen: LFS_CFLAGS  = `getconf LFS_CFLAGS 2>/dev/null`
-gen: LFS_LDFLAGS = `getconf LFS_LDFLAGS 2>/dev/null`
-gen: LFS_LIBS    = `getconf LFS_LIBS 2>/dev/null`
 gen: gen.c
 	${BUILD_CC} ${BUILD_CFLAGS} -I${top_srcdir}/lib/isc/include \
 	${LFS_CFLAGS} ${LFS_LDFLAGS} \

make/rules.in

@@ -116,6 +116,10 @@ BUILD_CPPFLAGS = @BUILD_CPPFLAGS@
 BUILD_LDFLAGS = @BUILD_LDFLAGS@
 BUILD_LIBS = @BUILD_LIBS@
 
+LFS_CFLAGS = @LFS_CFLAGS@
+LFS_LDFLAGS = @LFS_LDFLAGS@
+LFS_LIBS = @LFS_LIBS@
+
 .SUFFIXES:
 .SUFFIXES: .c .@O@