mirror of
https://github.com/mpv-player/mpv
synced 2024-10-22 08:51:57 +02:00
Consistent option and variable naming for x11libdir and xvmclibdir.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18983 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
d5368ffc42
commit
4efbcdb3b5
22
configure
vendored
22
configure
vendored
@ -421,7 +421,7 @@ multiple paths separated by ':'):
|
||||
--with-xmmslibdir=DIR libxmms.so.1 in DIR
|
||||
--with-cdparanoiaincdir=DIR cdparanoia headers in DIR (*)
|
||||
--with-cdparanoialibdir=DIR cdparanoia libraries (libcdda_*) in DIR (*)
|
||||
--with-xvmclib=NAME name of adapter-specific library (e.g. XvMCNVIDIA)
|
||||
--with-xvmclibdir=NAME name of adapter-specific library (e.g. XvMCNVIDIA)
|
||||
--with-termcaplib=NAME name of library with termcap functionality
|
||||
name should be given without leading "lib"
|
||||
checks for "termcap" and "tinfo"
|
||||
@ -2097,13 +2097,13 @@ for ac_option do
|
||||
_inc_x11=-I`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -I,g'`
|
||||
;;
|
||||
--with-x11libdir=*)
|
||||
_x11_paths=`echo $ac_option | cut -d '=' -f 2`
|
||||
_x11libdir=`echo $ac_option | cut -d '=' -f 2`
|
||||
;;
|
||||
--with-dxr2incdir=*)
|
||||
_inc_dxr2=-I`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -I,g'`
|
||||
;;
|
||||
--with-xvmclib=*)
|
||||
_xvmclib=`echo $ac_option | cut -d '=' -f 2`
|
||||
--with-xvmclibdir=*)
|
||||
_xvmclibdir=`echo $ac_option | cut -d '=' -f 2`
|
||||
;;
|
||||
--with-dvbincdir=*)
|
||||
_inc_dvb=-I`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -I,g'`
|
||||
@ -3761,10 +3761,10 @@ if test "$_x11" != no ; then
|
||||
#include <X11/Xutil.h>
|
||||
int main(void) { (void) XCreateWindow(0,0,0,0,0,0,0,0,0,0,0,0); return 0; }
|
||||
EOF
|
||||
if test -z "$_x11_paths" ; then
|
||||
_x11_paths="/usr/X11R6/lib /usr/lib/X11R6 /usr/X11/lib /usr/lib32 /usr/openwin/lib /usr/X11R6/lib64 /usr/lib"
|
||||
if test -z "$_x11libdir" ; then
|
||||
_x11libdir="/usr/X11R6/lib /usr/lib/X11R6 /usr/X11/lib /usr/lib32 /usr/openwin/lib /usr/X11R6/lib64 /usr/lib"
|
||||
fi
|
||||
for I in $_x11_paths ; do
|
||||
for I in $_x11libdir ; do
|
||||
_ld_x11="-L$I -lXext -lX11 $_ld_sock $_ld_pthread"
|
||||
if netbsd; then
|
||||
_ld_x11="$_ld_x11 -Wl,-R$I"
|
||||
@ -3869,16 +3869,16 @@ int main(void) {
|
||||
(void) XvMCCreateContext(0,0,0,0,0,0,0);
|
||||
return 0; }
|
||||
EOF
|
||||
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
|
||||
for _ld_tmp in $_xvmclibdir XvMCNVIDIA XvMCW I810XvMC ; do
|
||||
cc_check $_inc_x11 -lXvMC -l$_ld_tmp $_ld_xv $_ld_x11 && _xvmc=yes && _xvmclibdir="$_ld_tmp" && break
|
||||
done
|
||||
fi
|
||||
if test "$_xvmc" = yes ; then
|
||||
_def_xvmc='#define HAVE_XVMC 1'
|
||||
_ld_xvmc="-lXvMC -l$_xvmclib"
|
||||
_ld_xvmc="-lXvMC -l$_xvmclibdir"
|
||||
_vosrc="$_vosrc vo_xvmc.c"
|
||||
_vomodules="xvmc $_vomodules"
|
||||
_res_comment="using $_xvmclib"
|
||||
_res_comment="using $_xvmclibdir"
|
||||
else
|
||||
_def_xvmc='#undef HAVE_XVMC'
|
||||
_novomodules="xvmc $_novomodules"
|
||||
|
Loading…
Reference in New Issue
Block a user