Fix inconsistent feature enablements in cmake and configure

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 94a701db18d2bf2720d55cef7dd2f9246bc9ff32..778d5def9259c64af9ff5675dcb743bd49c8ac96 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -842,6 +842,17 @@ if(WITH_OPTIM)
                 endif()
             endif()
         endif()
+        if(WITH_SSSE3)
+            if(HAVE_SSSE3_INTRIN)
+                add_definitions(-DX86_SSSE3 -DX86_SSSE3_ADLER32)
+                set(SSSE3_SRCS ${ARCHDIR}/adler32_ssse3.c)
+                add_feature_info(SSSE3_ADLER32 1 "Support SSSE3-accelerated adler32, using \"${SSSE3FLAG}\"")
+                list(APPEND ZLIB_ARCH_SRCS ${SSSE3_SRCS})
+                set_property(SOURCE ${SSSE3_SRCS} PROPERTY COMPILE_FLAGS "${SSSE3FLAG} ${NOLTOFLAG}")
+            else()
+                set(WITH_SSSE3 OFF)
+            endif()
+        endif()
         if(FORCE_TZCNT)
             add_definitions(-DX86_NOCHECK_TZCNT)
         endif()

diff --git a/configure b/configure
index 99bd0ff51de02d6a7d26572f862817ce0a5ae71c..6e978ebb1b0f89bac3779143bbe65ed210b4a192 100755 (executable)
--- a/configure
+++ b/configure
@@ -1266,8 +1266,8 @@ case "${ARCH}" in
             fi
 
             if test ${HAVE_SSE2_INTRIN} -eq 1; then
-                CFLAGS="${CFLAGS} -DX86_SSE2 -DX86_SSE2_CHUNKSET"
-                SFLAGS="${SFLAGS} -DX86_SSE2 -DX86_SSE2_CHUNKSET"
+                CFLAGS="${CFLAGS} -DX86_SSE2 -DX86_SSE2_CHUNKSET -DX86_SSE2_SLIDEHASH"
+                SFLAGS="${SFLAGS} -DX86_SSE2 -DX86_SSE2_CHUNKSET -DX86_SSE2_SLIDEHASH"
                 ARCH_STATIC_OBJS="${ARCH_STATIC_OBJS} chunkset_sse.o slide_sse.o"
                 ARCH_SHARED_OBJS="${ARCH_SHARED_OBJS} chunkset_sse.lo slide_sse.lo"