Pull the values for LFS_{CFLAGS,LDFLAGS,LIBS} from autoconf instead using them direct...

diff --git a/config.h.in b/config.h.in
index 31307cb186f69a33cd2258bb9d33d748e68e0eb7..7f6a66c5032472e29554997bf661c35a600e2528 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -363,9 +363,6 @@
 /* Define to 1 if you have the `setresuid' function. */
 #undef HAVE_SETRESUID
 
-/* Define to 1 if you have the `sigwait' function. */
-#undef HAVE_SIGWAIT
-
 /* define if struct stat has st_mtim.tv_nsec field */
 #undef HAVE_STAT_NSEC
 

diff --git a/configure b/configure
index 0db42c485e0d9c7ba2b8b4f842ad1cd9633dc3c6..884e9edd39ca5aa3079e8c5d927d5ae7ffbd35de 100755 (executable)
--- a/configure
+++ b/configure
@@ -804,6 +804,9 @@ FGREP
 SED
 LIBTOOL
 SET_MAKE
+LFS_LIBS
+LFS_LDFLAGS
+LFS_CFLAGS
 EGREP
 GREP
 CPP
@@ -4171,6 +4174,14 @@ $as_echo "#define HAVE_FSEEKO 1" >>confdefs.h
 fi
 
 
+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

diff --git a/configure.ac b/configure.ac
index b2599e0a23972ed4b40081e27233cfd7c45cc450..d56f72890bd55c26edcb76f79dd6941b91b626a5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -26,6 +26,14 @@ AC_USE_SYSTEM_EXTENSIONS
 AC_SYS_LARGEFILE
 AC_FUNC_FSEEKO
 
+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])
 

diff --git a/lib/dns/Makefile.in b/lib/dns/Makefile.in
index b7693f0921442444d7f2da396c1da4b3eb64be72..4cc8a472764d4c82c7800364847c33bee6412ff6 100644 (file)
--- a/lib/dns/Makefile.in
+++ b/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} \

diff --git a/make/rules.in b/make/rules.in
index 6ecc5179aeb1908e88451d9817e9d20c15eae023..03e1fde18a8ab9d8e9c4fc5a1bc0adb41344aba3 100644 (file)
--- a/make/rules.in
+++ b/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@