summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorrathann <rathann@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-01-19 22:09:20 +0000
committerrathann <rathann@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-01-19 22:09:20 +0000
commit6c0d0ae39e9719a2d34b580e9dee2137a4dca1ff (patch)
tree6141895e3e1c4d4a128fa5bf944bc8fe8ef6008a /configure
parentcae85ae8f5fb62a6ab5d04ee6968f6d2d5bd1022 (diff)
downloadmpv-6c0d0ae39e9719a2d34b580e9dee2137a4dca1ff.tar.bz2
mpv-6c0d0ae39e9719a2d34b580e9dee2137a4dca1ff.tar.xz
Implement XvMC lib autodetection for future use (currently disabled, but working
if you set it xvmc=auto) and make the configure display the name of the lib it finds. Approved by iive. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17432 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure7
1 files changed, 4 insertions, 3 deletions
diff --git a/configure b/configure
index a3b537de84..68c8141288 100755
--- a/configure
+++ b/configure
@@ -1450,7 +1450,6 @@ EOF
cc_check -pipe && _pipe="-pipe" && echores "yes" || echores "no"
_prefix="/usr/local"
-_xvmclib="XvMCNVIDIA"
# GOTCHA: the variables below defines the default behavior for autodetection
# and have - unless stated otherwise - at least 2 states : yes no
@@ -3738,7 +3737,9 @@ int main(void) {
(void) XvMCCreateContext(0,0,0,0,0,0,0);
return 0; }
EOF
- cc_check $_inc_x11 -lXvMC -l$_xvmclib $_ld_xv $_ld_x11 && _xvmc=yes
+ for _ld_tmp in $_xvmclib XvMCNVIDIA XvMCW I810XvMC ; do
+ cc_check $_inc_x11 -lXvMC -l$_ld_tmp $_ld_xv $_ld_x11 && _xvmc=yes && _xvmclib="$_ld_tmp" && break
+ done
fi
if test "$_xvmc" = yes ; then
_def_xvmc='#define HAVE_XVMC 1'
@@ -3749,7 +3750,7 @@ else
_def_xvmc='#undef HAVE_XVMC'
_novomodules="xvmc $_novomodules"
fi
-echores "$_xvmc"
+echores "$_xvmc (using $_xvmclib)"
echocheck "Xinerama"