- simdzone-zone-load, fix dnstap/dnstap_config.h file from configure.

diff --git a/configure b/configure
index c0bc17b1eacfe5a507dd0ec8a664090ccfbf72f1..bdb263d7d92a4b8cb6b91506ebebfb603fa34fa5 100755 (executable)
--- a/configure
+++ b/configure
@@ -24797,9 +24797,6 @@ printf "%s\n" "#define DNSTAP_SOCKET_PATH \"$hdr_dnstap_socket_path\"" >>confdef
 
         DNSTAP_OBJ="dnstap.lo dnstap.pb-c.lo dnstap_fstrm.lo dtstream.lo"
 
-       dnstap_config="dnstap/dnstap_config.h.tmp:dnstap/dnstap_config.h.in"
-       dnstap_config_tmp="dnstap/dnstap_config.h.tmp"
-       dnstap_config_out="dnstap/dnstap_config.h"
 
     else
 
@@ -24809,6 +24806,9 @@ printf "%s\n" "#define DNSTAP_SOCKET_PATH \"$hdr_dnstap_socket_path\"" >>confdef
 
     fi
 
+dnstap_config="dnstap/dnstap_config.h.tmp:dnstap/dnstap_config.h.in"
+dnstap_config_tmp="dnstap/dnstap_config.h.tmp"
+dnstap_config_out="dnstap/dnstap_config.h"
 
 # check for dnscrypt if requested
 
@@ -27699,8 +27699,10 @@ if test -n "$dnstap_config"; then
        if test ! -f "$dnstap_config_out"; then
                mv "$dnstap_config_tmp" "$dnstap_config_out" || as_fn_error $? "Could not create $dnstap_config_out" "$LINENO" 5
        else if diff "$dnstap_config_out" "$dnstap_config_tmp" >/dev/null 2>&1; then
-               { printf "%s\n" "$as_me:${as_lineno-$LINENO}: In $srcdir: $dnstap_config_out is unchanged" >&5
+               if test "x$opt_dnstap" != "xno"; then
+                 { printf "%s\n" "$as_me:${as_lineno-$LINENO}: In $srcdir: $dnstap_config_out is unchanged" >&5
 printf "%s\n" "$as_me: In $srcdir: $dnstap_config_out is unchanged" >&6;}
+               fi
                rm -f "$dnstap_config_tmp"
        else
                rm -f "$dnstap_config_out"

diff --git a/configure.ac b/configure.ac
index 25b4354ba545ec4f02b49270fa6acb8545c9f90e..dab1732f77c7580053293adc21dfc565bd53c4c6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2018,14 +2018,14 @@ dt_DNSTAP([$UNBOUND_RUN_DIR/dnstap.sock],
        AC_SUBST(DNSTAP_SOCKET_TESTBIN,['unbound-dnstap-socket$(EXEEXT)'])
         AC_SUBST([DNSTAP_SRC], ["dnstap/dnstap.c dnstap/dnstap.pb-c.c dnstap/dnstap_fstrm.c dnstap/dtstream.c"])
         AC_SUBST([DNSTAP_OBJ], ["dnstap.lo dnstap.pb-c.lo dnstap_fstrm.lo dtstream.lo"])
-       dnstap_config="dnstap/dnstap_config.h.tmp:dnstap/dnstap_config.h.in"
-       dnstap_config_tmp="dnstap/dnstap_config.h.tmp"
-       dnstap_config_out="dnstap/dnstap_config.h"
     ],
     [
         AC_SUBST([ENABLE_DNSTAP], [0])
     ]
 )
+dnstap_config="dnstap/dnstap_config.h.tmp:dnstap/dnstap_config.h.in"
+dnstap_config_tmp="dnstap/dnstap_config.h.tmp"
+dnstap_config_out="dnstap/dnstap_config.h"
 
 # check for dnscrypt if requested
 dnsc_DNSCRYPT([
@@ -2499,7 +2499,9 @@ if test -n "$dnstap_config"; then
        if test ! -f "$dnstap_config_out"; then
                mv "$dnstap_config_tmp" "$dnstap_config_out" || AC_MSG_ERROR([Could not create $dnstap_config_out])
        else if diff "$dnstap_config_out" "$dnstap_config_tmp" >/dev/null 2>&1; then
-               AC_MSG_NOTICE([In $srcdir: $dnstap_config_out is unchanged])
+               if test "x$opt_dnstap" != "xno"; then
+                 AC_MSG_NOTICE([In $srcdir: $dnstap_config_out is unchanged])
+               fi
                rm -f "$dnstap_config_tmp"
        else
                rm -f "$dnstap_config_out"