dnsdist: Disable ipcrypt2 by default w/ autotools

Signed-off-by: Remi Gacogne <remi.gacogne@powerdns.com>

diff --git a/pdns/dnsdistdist/m4/pdns_enable_ipcrypt2.m4 b/pdns/dnsdistdist/m4/pdns_enable_ipcrypt2.m4
index 9351af5850119e94d74b2831f70f6c0744a2c2c0..cd2f0c27af2a69ebb2803ee9c7316a6c0f73a59e 100644 (file)
--- a/pdns/dnsdistdist/m4/pdns_enable_ipcrypt2.m4
+++ b/pdns/dnsdistdist/m4/pdns_enable_ipcrypt2.m4
@@ -1,9 +1,9 @@
 AC_DEFUN([PDNS_ENABLE_IPCRYPT2], [
   AC_MSG_CHECKING([whether to enable ipcrypt2 support])
   AC_ARG_ENABLE([ipcrypt2],
-    AS_HELP_STRING([--enable-ipcrypt2], [enable ipcrypt2 support @<:@default=auto@:>@]),
+    AS_HELP_STRING([--enable-ipcrypt2], [enable ipcrypt2 support @<:@default=no@:>@]),
     [enable_ipcrypt2=$enableval],
-    [enable_ipcrypt2=auto]
+    [enable_ipcrypt2=no]
   )
 
   AC_MSG_RESULT([$enable_ipcrypt2])
@@ -13,7 +13,7 @@ AC_DEFUN([PDNS_ENABLE_IPCRYPT2], [
   AS_IF([test "x$enable_ipcrypt2" != "xno"], [
     AC_CANONICAL_BUILD()
     AS_IF([test "$build_cpu" = "aarch64"], [
-      AC_MSG_CHECKING([whether the compiler supports calculations with uint64x2_t and _mm_loadu_si64])
+      AC_MSG_CHECKING([whether the compiler supports calculations with uint64x2_t])
       AC_LANG_PUSH([C++])
       AC_COMPILE_IFELSE([AC_LANG_SOURCE([
 #    if defined(_MSC_VER) && defined(_M_ARM64)
@@ -21,13 +21,10 @@ AC_DEFUN([PDNS_ENABLE_IPCRYPT2], [
 #    else
 #        include <arm_neon.h>
 #    endif
-#include <emmintrin.h>
 int main() {
   uint64x2_t foo = {0, 0};
   uint64x2_t bar = vshrq_n_u8(foo, 1);
-  void *a = (void*) &_mm_loadu_si64;
-  long long b = (long long) a;
-  return (int) b;
+  return 0;
 }
         ])],[
         [HAVE_IPCRYPT2=1]
@@ -37,28 +34,14 @@ int main() {
       ])
       AC_LANG_POP()
     ], [
-      AC_MSG_CHECKING([whether the compiler supports _mm_loadu_si64])
-      AC_LANG_PUSH([C++])
-      AC_COMPILE_IFELSE([AC_LANG_SOURCE([
-#include <emmintrin.h>
-int main() {
-  void *a = (void*) &_mm_loadu_si64;
-  long long b = (long long) a;
-  return (int) b;
-}
-        ])],[
         [HAVE_IPCRYPT2=1]
         AC_MSG_RESULT([ok])
-      ], [
-        AC_MSG_RESULT([no])
-      ])
-      AC_LANG_POP()
     ])
   ])
 
   AM_CONDITIONAL([HAVE_IPCRYPT2], [test "x$HAVE_IPCRYPT2" != "x0"])
 
-  AS_IF([test "x$enable_ipcrypt2" = "xyes"], [
+  AS_IF([test "x$enable_ipcrypt2" != "xno"], [
     AS_IF([test x"$HAVE_IPCRYPT2" = "x0"], [
       AC_MSG_ERROR([ipcrypt2 support requested but is not available])
     ])