From 643b9d0183d240735de14a06d682018977634b0e Mon Sep 17 00:00:00 2001
From: Wayne Davison <wayne@opencoder.net>
Date: Tue, 16 Jun 2020 22:59:54 -0700
Subject: [PATCH] Change SIMD back to disabled unless requested.

---
 .github/workflows/ccpp.yml |  2 +-
 Makefile.in                |  1 -
 configure.ac               | 13 ++++---------
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml
index 0fca1602..f42b09dd 100644
--- 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
+      run: ./configure --with-included-popt --with-included-zlib --enable-simd
     - name: make
       run: make
     - name: version-summary
diff --git a/Makefile.in b/Makefile.in
index f2173322..d2329cef 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -125,7 +125,6 @@ rounding.h: rounding.c rsync.h proto.h
 	@rm -f rounding.out
 
 simd-checksum-x86_64.o: simd-checksum-x86_64.cpp
-	@echo "If this fails to compile and you can't fix it, re-run configure with --disable-simd."
 	$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c -o $@ $(srcdir)/simd-checksum-x86_64.cpp
 
 lib/md5-asm-x86_64.o: lib/md5-asm-x86_64.s
diff --git a/configure.ac b/configure.ac
index d8f44d6b..f1f075df 100644
--- a/configure.ac
+++ b/configure.ac
@@ -197,9 +197,9 @@ SIMD=
 
 AC_MSG_CHECKING([whether to enable SIMD optimizations])
 AC_ARG_ENABLE(simd,
-    AS_HELP_STRING([--disable-simd],[disable SIMD optimizations (requires g++)]))
+    AS_HELP_STRING([--enable-simd],[enable SIMD optimizations (requires g++)]))
 
-if test x"$enable_simd" != x"no"; then
+if test x"$enable_simd" = x"yes"; then
     # For x86-64 SIMD, g++ is also required
     if test x"$build_cpu" = x"x86_64"; then
 	if test x"$CXX" = x"g++"; then
@@ -207,13 +207,8 @@ if test x"$enable_simd" != x"no"; then
 	    SIMD="$SIMD x86_64"
 	else
 	    AC_MSG_RESULT(no)
-	    case "$host_os" in
-	    *linux*)
-		AC_MSG_ERROR(Failed to find g++ for SIMD speedups. Use --disable-simd to continue without it.)
-		;;
-	    *)
-		;;
-	    esac
+	    AC_MSG_ERROR(Failed to find g++ for SIMD speedups.
+Omit --enable-simd to continue without it.)
 	fi
     fi
 fi
-- 
2.34.1