- simdzone-zone-load, fix for autoconf 2.72 and no Makefile in simdzone.

diff --git a/configure b/configure
index ec7609c47b07acc6494efcdd922cae53102b22f1..06521bf9d2bbb0d1b9bad67fefc8ebde6d21fc90 100755 (executable)
--- a/configure
+++ b/configure
@@ -661,8 +661,8 @@ ac_includes_default="\
 ac_header_c_list=
 ac_func_c_list=
 enable_option_checking=no
-ac_subst_vars='LTLIBOBJS
-SIMDZONE_OBJ
+ac_subst_vars='SIMDZONE_OBJ
+LTLIBOBJS
 subdirs
 date
 version
@@ -25413,9 +25413,6 @@ if test ! -f simdzone/configure; then as_fn_error $? "There is no \"simdzone/con
 
 subdirs="$subdirs simdzone"
 
-# Pick up the objects for simdzone.
-SIMDZONE_OBJ=`(cd simdzone; make list_objs) | sed -e 's?src?simdzone/src?g'`
-
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -27698,6 +27695,11 @@ if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
 printf "%s\n" "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
 fi
 
+# Pick up the objects for simdzone.
+SIMDZONE_OBJ=`(cd simdzone; make list_objs) | sed -e 's?src?simdzone/src?g'`
+
+sed -e 's?^SIMDZONE_OBJ=.*$?SIMDZONE_OBJ='"$SIMDZONE_OBJ"'?' < Makefile > Makefile.tmp.$$
+mv -f Makefile.tmp.$$ Makefile
 # If dnstap config has changed, overwrite it.
 if test -n "$dnstap_config"; then
        if test ! -f "$dnstap_config_out"; then

diff --git a/configure.ac b/configure.ac
index 541157ca38819dc6f7570d914adf07c88bd7f1ab..a84e05cae1af4907f7b6ea45419511330f495ca9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2493,11 +2493,13 @@ AC_ARG_ENABLE(haswell, AS_HELP_STRING([--disable-haswell], [Disable Haswell (AVX
 if test ! -f simdzone/configure.ac; then AC_MSG_ERROR([There is no "simdzone/configure.ac" file. The simdzone directory has not been fetched, perhaps get it with 'git submodule update --init'.]); fi
 if test ! -f simdzone/configure; then AC_MSG_ERROR([There is no "simdzone/configure" file. The simdzone directory has no configure script file, perhaps run 'autoreconf -fi'.]); fi
 AC_CONFIG_SUBDIRS([simdzone])
+
+AC_OUTPUT
 # Pick up the objects for simdzone.
 SIMDZONE_OBJ=`(cd simdzone; make list_objs) | sed -e 's?src?simdzone/src?g'`
 AC_SUBST(SIMDZONE_OBJ)
-
-AC_OUTPUT
+sed -e 's?^SIMDZONE_OBJ=.*$?SIMDZONE_OBJ='"$SIMDZONE_OBJ"'?' < Makefile > Makefile.tmp.$$
+mv -f Makefile.tmp.$$ Makefile
 # If dnstap config has changed, overwrite it.
 if test -n "$dnstap_config"; then
        if test ! -f "$dnstap_config_out"; then