Description: Follow Debian Baseline

 Build machine might have different configuration than the target.

Author: Ricardo Ribalda Delgado <ricardo@ribalda.com>
Bug-Debian: https://bugs.debian.org/964957
---

--- ugrep-2.5.6+dfsg.orig/configure.ac
+++ ugrep-2.5.6+dfsg/configure.ac
@@ -160,8 +160,6 @@ AC_MSG_CHECKING(for --disable-avx)
 if test "x$with_no_avx" = "xno"; then
   AC_MSG_RESULT(no)
   AC_MSG_CHECKING([whether ${CXX} supports AVX intrinsics])
-  save_CXXFLAGS=$CXXFLAGS
-  CXXFLAGS="-march=native"
   AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <immintrin.h>]], [[__m512 n = _mm512_set1_epi8(42); (void)_mm512_cmpeq_epi8_mask(n, n);]])],
                     [mavx_ok=yes],
                     [mavx_ok=no])
@@ -175,7 +173,6 @@ if test "x$with_no_avx" = "xno"; then
       SIMD_FLAGS="-mavx2 -DHAVE_AVX2"
     fi
   fi
-  CXXFLAGS=$save_CXXFLAGS
   AC_MSG_RESULT($mavx_ok)
 else
   AC_MSG_RESULT(yes)
@@ -192,12 +189,9 @@ AC_MSG_CHECKING(for --disable-sse2)
 if test "x$with_no_sse2" = "xno"; then
   AC_MSG_RESULT(no)
   AC_MSG_CHECKING([whether ${CXX} supports SSE2 intrinsics])
-  save_CXXFLAGS=$CXXFLAGS
-  CXXFLAGS="-march=native"
   AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <emmintrin.h>]], [[__m128i n = _mm_set1_epi8(42);]])],
                     [msse2_ok=yes],
                     [msse2_ok=no])
-  CXXFLAGS=$save_CXXFLAGS
   AC_MSG_RESULT($msse2_ok)
   if test "x$msse2_ok" = "xyes"; then
     SIMD_FLAGS="-msse2 -DHAVE_SSE2"
@@ -224,8 +218,6 @@ if test "x$with_no_neon" = "xno"; then
   if test "x$mneon_ok" = "xyes"; then
     SIMD_FLAGS="-DHAVE_NEON"
   else
-    save_CXXFLAGS=$CXXFLAGS
-    CXXFLAGS="-march=native"
     AC_PREPROC_IFELSE([AC_LANG_PROGRAM([[#include <arm_neon.h>]], [[uint64x2_t n; uint64_t m = vgetq_lane_u64(n, 0);]])],
                       [mneon_ok=yes],
                       [mneon_ok=no])
@@ -234,18 +226,17 @@ if test "x$with_no_neon" = "xno"; then
                         [mneon_ok=yes],
                         [mneon_ok=no])
       if test "x$mneon_ok" = "xyes"; then
-        SIMD_FLAGS="-march=native -DHAVE_NEON"
+        SIMD_FLAGS="-DHAVE_NEON"
       else
-        CXXFLAGS="-march=native -mfpu=neon"
+        CXXFLAGS="-mfpu=neon"
         AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <arm_neon.h>]], [[uint64x2_t n; uint64_t m = vgetq_lane_u64(n, 0);]])],
                           [mneon_ok=yes],
                           [mneon_ok=no])
         if test "x$mneon_ok" = "xyes"; then
-          SIMD_FLAGS="-march=native -mfpu=neon -DHAVE_NEON"
+          SIMD_FLAGS="-mfpu=neon -DHAVE_NEON"
         fi
       fi
     fi
-    CXXFLAGS=$save_CXXFLAGS
   fi
   AC_MSG_RESULT($mneon_ok)
 else