summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure9
1 files changed, 6 insertions, 3 deletions
diff --git a/configure b/configure
index b61a212c7e..681a6b983c 100755
--- a/configure
+++ b/configure
@@ -1815,7 +1815,9 @@ cat > $TMPC << EOF
int main(void) { return 0; }
EOF
if test "$_runtime_cpudetection" = no ; then
- cc_check -march=native && proc=native
+ if test $cc_vendor != "intel" ; then
+ cc_check -march=native && proc=native
+ fi
if test "$proc" = "k8"; then
cc_check -march=$proc $cpuopt=$proc || proc=athlon-xp
fi
@@ -1963,7 +1965,9 @@ int main(void) { return 0; }
EOF
# This is a stripped-down version of the i386 fallback.
if test "$_runtime_cpudetection" = no ; then
- cc_check -march=native && proc=native
+ if test $cc_vendor != "intel" ; then
+ cc_check -march=native && proc=native
+ fi
# --- AMD processors ---
if test "$proc" = "k8"; then
cc_check -march=$proc $cpuopt=$proc || proc=athlon-xp
@@ -8492,7 +8496,6 @@ $def_yasm
#define CONFIG_LIBVORBIS 0
#define CONFIG_POWERPC_PERF 0
#define CONFIG_SMALL 0
-#define CONFIG_SWSCALE 1
#define CONFIG_SWSCALE_ALPHA 1
#define HAVE_ATTRIBUTE_PACKED 1