Make SIMD enabled by default again (for x86_64)

diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml
index f42b09dd068c876ee5a5f9ab7a49f055bb6627b7..0fca160213d3352c4a0513c3657b403b23a3127b 100644 (file)
--- a/.github/workflows/ccpp.yml
+++ b/.github/workflows/ccpp.yml
@@ -18,7 +18,7 @@ jobs:
     - name: prepare-source
       run: ./prepare-source
     - name: configure
-      run: ./configure --with-included-popt --with-included-zlib --enable-simd
+      run: ./configure --with-included-popt --with-included-zlib
     - name: make
       run: make
     - name: version-summary

diff --git a/NEWS.md b/NEWS.md
index f308460b3d1d95f6ae3dc55175ccdbb093283931..b4d7d13e89fbe9ad529be2f42e15d0ec7d38dd16 100644 (file)
--- a/NEWS.md
+++ b/NEWS.md
@@ -170,8 +170,8 @@ Protocol: 31 (unchanged)
    algorithms, extra checksum algorithms, and allow use of openssl's crypto
    lib for (potentially) faster MD4/MD5 checksums.
 
- - Add _build_ dependency for g++ on x86_64 systems **if** you want to enable
-   the SIMD checksum optimizations (via `configure --enable-simd`).
+ - Add _build_ dependency for g++ or clang++ on x86_64 systems to enable the
+   SIMD checksum optimizations.
 
  - Add _build_ dependency for _either_ python3-cmarkcfm or python3-commonmark
    to allow for patching of man pages or building a git release.  This is not

diff --git a/configure.ac b/configure.ac
index a01dd70102755571debba1de4fb25d9d6b8afb80..3330eb90ef83a450c3876c3d9c07238b8f81a90a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -198,9 +198,9 @@ SIMD=
 
 AC_MSG_CHECKING([whether to enable SIMD optimizations])
 AC_ARG_ENABLE(simd,
-    AS_HELP_STRING([--enable-simd],[enable SIMD optimizations (requires c++)]))
+    AS_HELP_STRING([--disable-simd],[disable SIMD optimizations (requires c++)]))
 
-if test x"$enable_simd" = x"yes"; then
+if test x"$enable_simd" != x"no"; then
     # For x86-64 SIMD, g++ >=5 or clang++ >=7 is required
     if test x"$build_cpu" = x"x86_64"; then
        if test x"$CXX" != x""; then
@@ -228,13 +228,13 @@ if test x"$enable_simd" = x"yes"; then
            else
                AC_MSG_RESULT(error)
                AC_MSG_ERROR([Failed to find g++ >=5 or clang++ >=7 for SIMD optimizations.
-Omit --enable-simd to continue without it. ($CXX, $CXX_VERSION)])
+Specify --disable-simd to continue without it. ($CXX, $CXX_VERSION)])
            fi
        fi
-    else
+    elif test x"$enable_simd" = x"yes"; then
         AC_MSG_RESULT(unavailable)
         AC_MSG_ERROR(The SIMD optimizations are currently x86_64 only.
-Omit --enable-simd to continue.)
+Omit --enable-simd to continue without it.)
     fi
 fi