RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Remove --with-xvidlibdir. 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21110 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego 2006-11-20 16:51:09 +00:00
parent 8ac4f3fce1
commit 07b02cc94a
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
configure vendored
View File

@ -422,7 +422,6 @@ multiple paths separated by ':'):
--with-extraincdir=DIR extra header search paths in DIR (*) --with-extraincdir=DIR extra header search paths in DIR (*)
--with-extralibdir=DIR extra linker search paths in DIR (*) --with-extralibdir=DIR extra linker search paths in DIR (*)
--with-x11libdir=DIR X library files in DIR (*) --with-x11libdir=DIR X library files in DIR (*)
--with-xvidlibdir=DIR libxvidcore (XviD) in DIR (*)
--with-x264libdir=DIR libx264 in DIR --with-x264libdir=DIR libx264 in DIR
--with-livelibdir=DIR LIVE555 Streaming Media in DIR --with-livelibdir=DIR LIVE555 Streaming Media in DIR
--with-xmmsplugindir=DIR XMMS plugins in DIR --with-xmmsplugindir=DIR XMMS plugins in DIR
@ -2136,9 +2135,6 @@ for ac_option do
--with-xvmclib=*) --with-xvmclib=*)
_xvmclib=`echo $ac_option | cut -d '=' -f 2` _xvmclib=`echo $ac_option | cut -d '=' -f 2`
;; ;;
--with-xvidlibdir=*)
_ld_xvid=-L`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'`
;;
--with-x264libdir=*) --with-x264libdir=*)
_ld_x264=-L`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'` _ld_x264=-L`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'`
;; ;;
@ -6394,13 +6390,12 @@ echores "$_bl"
echocheck "XviD" echocheck "XviD"
if test "$_xvid" = auto ; then if test "$_xvid" = auto ; then
_xvid=no _xvid=no
_ld_xvid="$_ld_xvid -lxvidcore $_ld_lm"
cat > $TMPC << EOF cat > $TMPC << EOF
#include <xvid.h> #include <xvid.h>
int main(void) { xvid_global(0, 0, 0, 0); return 0; } int main(void) { xvid_global(0, 0, 0, 0); return 0; }
EOF EOF
for _ld_tmp in "$_ld_xvid" "$_ld_xvid $_ld_pthread" ; do for _ld_tmp in "-lxvidcore $_ld_lm" "-lxvidcore $_ld_lm $_ld_pthread" ; do
cc_check $_ld_tmp && _ld_xvid="$_ld_tmp" && _xvid=yes && break cc_check $_ld_tmp && _ld_extra="$_ld_extra $_ld_tmp" && _xvid=yes && break
done done
fi fi
@ -6410,7 +6405,6 @@ if test "$_xvid" = yes ; then
else else
_def_xvid='#undef HAVE_XVID4' _def_xvid='#undef HAVE_XVID4'
_nocodecmodules="xvid $_nocodecmodules" _nocodecmodules="xvid $_nocodecmodules"
_ld_xvid=""
fi fi
echores "$_xvid" echores "$_xvid"
@ -6420,7 +6414,7 @@ if test "$_xvid" = yes ; then
#include <xvid.h> #include <xvid.h>
int main(void) { xvid_plugin_2pass2_t s; s.vbv_size=0; return 0; } int main(void) { xvid_plugin_2pass2_t s; s.vbv_size=0; return 0; }
EOF EOF
if cc_check $_ld_xvid $_ld_lb ; then if cc_check ; then
_lavc_xvid=yes _lavc_xvid=yes
_def_lavc_xvid='#define CONFIG_XVID 1' _def_lavc_xvid='#define CONFIG_XVID 1'
else else
@ -7391,7 +7385,6 @@ EXTRALIBS = $_extra_libs
EXTRA_LIB = $_ld_extra \ EXTRA_LIB = $_ld_extra \
$_ld_static $_ld_win32 \ $_ld_static $_ld_win32 \
$_ld_win32libs $_ld_lm $_ld_gif \ $_ld_win32libs $_ld_lm $_ld_gif \
$_ld_xvid \
$_ld_vorbis $_ld_theora $_xmms_lib \ $_ld_vorbis $_ld_theora $_xmms_lib \
$_ld_arch $_ld_arch
VO_LIBS = $_ld_aa $_ld_sdl $_ld_ggi $_ld_svga $_ld_directfb $_ld_caca \ VO_LIBS = $_ld_aa $_ld_sdl $_ld_ggi $_ld_svga $_ld_directfb $_ld_caca \