Fix: compile with distro-specific OPTFLAGS

Author: rhash

configure

@@ -776,14 +776,15 @@ if test "$OPT_SHANI" = "auto"; then
       "__m128i a = _mm_setzero_si128(); (void)_mm_extract_epi32(a, 0);" \
       "-msse4"; then
     HAS_SSE4=yes
-	# Now check for the SHANI extension
+    # Now check for the SHANI extension
     if cc_check_statement "x86intrin.h" \
         "__m128i a = _mm_setzero_si128(); a = _mm_sha1rnds4_epu32(a, a, 0);" \
         "-msse4 -msha";
     then
       HAS_X86_SSE4_SHANI=yes
-	  LIBRHASH_OPTFLAGS=$(join_params $LIBRHASH_OPTFLAGS -msse4 -msha)
-	  LIBRHASH_DEFINES=$(join_params $LIBRHASH_DEFINES -DRHASH_SSE4_SHANI)
+      # Add all SHANI options to the LIBRHASH_OPTFLAGS, so it can be overriden by
+      # distro-specific OPTFLAGS, but only all together
+      LIBRHASH_OPTFLAGS=$(join_params $LIBRHASH_OPTFLAGS -DRHASH_SSE4_SHANI -msse4 -msha)
     fi
   fi
   finish_check "$HAS_X86_SSE4_SHANI"