Merge branch 'master' into ti

This commit is contained in:
toddouska
2014-05-28 17:49:34 -07:00

View File

@@ -390,8 +390,11 @@ then
then
# GCC needs these flags, icc doesn't
# opt levels greater than 2 may cause problems on systems w/o aesni
if test "$CC" != "icc"
then
AM_CFLAGS="$AM_CFLAGS -maes -msse4"
fi
fi
fi
AM_CONDITIONAL([BUILD_AESNI], [test "x$ENABLED_AESNI" = "xyes"])