_disable_avx_in_configure

Gbp-Pq: Name 001_disable_avx_in_configure.patch

diff --git a/configure.ac b/configure.ac
index a9844d79e178705c8eca0d587cbcb440bf4af4d6..d0cb449280aa614dce9acf1fdbc59febc0477303 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -523,7 +523,8 @@ AH_TEMPLATE([HAVE_STD_MAX],[Define to 1 if max is in namespace std::])
 AH_TEMPLATE([HAVE_STD_TRANSFORM],[Define to 1 if transform is in namespace std::])
 SAH_FUNCS_IN_NAMESPACE([['min(0,0)'] ['max(0,0)'] ['transform((char *)0,(char *)0,(char *)0,(int(*)(int))malloc)']],std)
 
-SAH_AVX
+#SAH_AVX
+have_avx=no
 
 AM_CONDITIONAL(USE_MY_IMAGELIBS, [false])
 AM_CONDITIONAL(USE_MY_GLUT, [false])

diff --git a/m4/sah_avx.m4 b/m4/sah_avx.m4
index 10f85159731e3a5f5828e6f030d3585ac726bb46..e71e7561a3c7465180e8fc925a3d40b45589efa1 100644 (file)
--- a/m4/sah_avx.m4
+++ b/m4/sah_avx.m4
@@ -2,7 +2,7 @@ AC_DEFUN([SAH_AVX],[
   AC_LANG_PUSH(C)
   AC_MSG_CHECKING([if compiler supports -mavx])
   save_cflags="${CFLAGS}"
-  CFLAGS="-mavx"
+  CFLAGS="${CFLAGS} -mavx"
   AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[return 0;])],[
   have_avx=yes
   ],[