From 0b53b8f332b39f72ab4235e6f9a942beddf974f6 Mon Sep 17 00:00:00 2001
From: laanwj <126646+laanwj@users.noreply.github.com>
Date: Wed, 11 May 2022 20:14:24 +0200
Subject: [PATCH] Merge bitcoin/bitcoin#25051: Bugfix: configure: Define
 defaults for enable_arm_{crc,shani}

7fd0860d12da723a228ddd3c9fb905380eb8b379 Bugfix: configure: Define defaults for enable_arm_{crc,shani} (Luke Dashjr)

Pull request description:

  Fix for #17398 and #24115

  Trivial, mostly for consistency (you'd have to *try* to break this)

ACKs for top commit:
  pk-b2:
    ACK https://github.com/bitcoin/bitcoin/pull/25051/commits/7fd0860d12da723a228ddd3c9fb905380eb8b379
  seejee:
    ACK https://github.com/bitcoin/bitcoin/commit/7fd0860d12da723a228ddd3c9fb905380eb8b379
  vincenzopalazzo:
    ACK https://github.com/bitcoin/bitcoin/pull/25051/commits/7fd0860d12da723a228ddd3c9fb905380eb8b379

Tree-SHA512: 51c389787c369f431ca57071f03392438bff9fd41f128c63ce74ca30d2257213f8be225efcb5c1329ad80b714f44427d721215d4f848cc8e63060fa5bc8f1f2e
---
 configure.ac | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/configure.ac b/configure.ac
index 5433b382ce..e301be9865 100644
--- a/configure.ac
+++ b/configure.ac
@@ -490,6 +490,8 @@ fi
 dnl Don't allow extended (non-ASCII) symbols in identifiers. This is easier for code review.
 AX_CHECK_COMPILE_FLAG([-fno-extended-identifiers],[[CXXFLAGS="$CXXFLAGS -fno-extended-identifiers"]],,[[$CXXFLAG_WERROR]])
 
+enable_arm_crc=no
+enable_arm_shani=no
 enable_sse42=no
 enable_sse41=no
 enable_avx2=no