summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xconfigure3
1 files changed, 2 insertions, 1 deletions
diff --git a/configure b/configure
index 413f412f0f..84c2254298 100755
--- a/configure
+++ b/configure
@@ -769,7 +769,7 @@ elif test -r /compat/linux/proc/cpuinfo && not x86 ; then
# FreeBSD with Linux emulation /proc mounted,
# extract CPU information from it
_cpuinfo="cat /compat/linux/proc/cpuinfo"
-elif darwin ; then
+elif darwin && not x86 ; then
# use hostinfo on Darwin
_cpuinfo="hostinfo"
elif aix; then
@@ -2295,6 +2295,7 @@ if test "$_vidix" = auto ; then
qnx && _vidix=no
sunos && _vidix=no
beos && _vidix=no
+ darwin && _vidix=no
fi
echocheck "mplayer binary name"