summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authornplourde <nplourde@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-02-22 00:59:11 +0000
committernplourde <nplourde@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-02-22 00:59:11 +0000
commit896b9248fa7d69c596a98e063bb73f68ee22d2f8 (patch)
treeb062deffdecf1de425fe2a0d4fd0058c4249a7e3 /configure
parent498083c2b20836e2fdaabb8be823359b7c92c9f2 (diff)
downloadmpv-896b9248fa7d69c596a98e063bb73f68ee22d2f8.tar.bz2
mpv-896b9248fa7d69c596a98e063bb73f68ee22d2f8.tar.xz
properly detect cpu on x86 based mac
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17664 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'configure')
-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"