RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-04-04 15:34:31 +00:00
Code Issues Releases Wiki Activity

cosmetics: Rename some variables and command line parameters.

Browse Source 
(preparation for upcoming patches)


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18737 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego 2006-06-16 21:17:47 +00:00
parent ab93c42241
commit 19a3207d8d
1 changed files with 73 additions and 73 deletions

146
configure vendored
View File

@ -205,7 +205,7 @@ Installation directories:
Optional features: Optional features:
--disable-mencoder disable mencoder (a/v encoder) compilation [enable] --disable-mencoder disable mencoder (a/v encoder) compilation [enable]
--enable-gui enable gmplayer compilation (GTK+ GUI) [disable] --enable-gui enable gmplayer compilation (GTK+ GUI) [disable]
--enable-old-gtk force using GTK 1.2 for GUI [disable] --enable-gtk1 force using GTK 1.2 for GUI [disable]
--enable-largefiles enable support for files > 2 GBytes [disable] --enable-largefiles enable support for files > 2 GBytes [disable]
--enable-linux-devfs set default devices to devfs ones [disable] --enable-linux-devfs set default devices to devfs ones [disable]
--enable-termcap use termcap database for key codes [autodetect] --enable-termcap use termcap database for key codes [autodetect]
@ -272,14 +272,14 @@ Codecs:
--disable-libavformat_so disable shared libavformat [autodetect] --disable-libavformat_so disable shared libavformat [autodetect]
--disable-libpostproc_so disable shared libpostproc [autodetect] --disable-libpostproc_so disable shared libpostproc [autodetect]
--enable-libfame enable libfame realtime encoder [autodetect] --enable-libfame enable libfame realtime encoder [autodetect]
--disable-internal-tremor do not build internal OggVorbis support [enabled] --disable-tremor-internal do not build internal OggVorbis support [enabled]
--enable-tremor-low build with lower accuracy internal tremor [disabled] --enable-tremor-low build with lower accuracy internal tremor [disabled]
--enable-external-tremor build with external tremor [disabled] --enable-tremor-external build with external tremor [disabled]
--disable-vorbis disable OggVorbis support entirely [autodetect] --disable-vorbis disable OggVorbis support entirely [autodetect]
--disable-speex disable Speex support [autodetect] --disable-speex disable Speex support [autodetect]
--enable-theora build with OggTheora support [autodetect] --enable-theora build with OggTheora support [autodetect]
--enable-external-faad build with external FAAD2 (AAC) support [autodetect] --enable-faad-external build with external FAAD2 (AAC) support [autodetect]
--disable-internal-faad disable internal FAAD2 (AAC) support [autodetect] --disable-faad-internal disable internal FAAD2 (AAC) support [autodetect]
--disable-faac disable support for FAAC (AAC encoder) [autodetect] --disable-faac disable support for FAAC (AAC encoder) [autodetect]
--disable-ladspa disable LADSPA plugin support [autodetect] --disable-ladspa disable LADSPA plugin support [autodetect]
--disable-libdv disable libdv 0.9.5 en/decoding support [autodetect] --disable-libdv disable libdv 0.9.5 en/decoding support [autodetect]
@ -299,8 +299,8 @@ Codecs:
--enable-codec=CODEC dnable specified codec --enable-codec=CODEC dnable specified codec
Video output: Video output:
--disable-internal-vidix disable internal VIDIX [for x86 *nix] --disable-vidix-internal disable internal VIDIX [for x86 *nix]
--disable-external-vidix disable external VIDIX [for x86 *nix] --disable-vidix-external disable external VIDIX [for x86 *nix]
--enable-gl build with OpenGL render support [autodetect] --enable-gl build with OpenGL render support [autodetect]
--enable-dga[=n] build with DGA [n in {1, 2} ] support [autodetect] --enable-dga[=n] build with DGA [n in {1, 2} ] support [autodetect]
--enable-vesa build with VESA support [autodetect] --enable-vesa build with VESA support [autodetect]
@ -478,10 +478,10 @@ for ac_option do
_as=`echo $ac_option | cut -d '=' -f 2` _as=`echo $ac_option | cut -d '=' -f 2`
;; ;;
--enable-gcc-checking) --enable-gcc-checking)
_skip_cc_check=no _gcc_checking=yes
;; ;;
--disable-gcc-checking) --disable-gcc-checking)
_skip_cc_check=yes _gcc_checking=no
;; ;;
--enable-static) --enable-static)
_ld_static='-static' _ld_static='-static'
@ -671,7 +671,7 @@ else
fi fi
# Checking CC version... # Checking CC version...
if test "$_skip_cc_check" != yes ; then if test "$_gcc_checking" != no ; then
# Intel C++ Compilers (no autoselect, use CC=/some/binary ./configure) # Intel C++ Compilers (no autoselect, use CC=/some/binary ./configure)
if test "`basename $_cc`" = "icc" || test "`basename $_cc`" = "ecc"; then if test "`basename $_cc`" = "icc" || test "`basename $_cc`" = "ecc"; then
echocheck "$_cc version" echocheck "$_cc version"
@ -1559,7 +1559,7 @@ _libavformat=auto
_libavformat_so=auto _libavformat_so=auto
_libpostproc=auto _libpostproc=auto
_libpostproc_so=auto _libpostproc_so=auto
_fame=auto _libfame=auto
_mp1e=no _mp1e=no
_mencoder=yes _mencoder=yes
_x11=auto _x11=auto
@ -1571,7 +1571,7 @@ _directx=auto
_win32waveout=auto _win32waveout=auto
_nas=auto _nas=auto
_png=auto _png=auto
_jpg=auto _jpeg=auto
_pnm=yes _pnm=yes
_md5sum=yes _md5sum=yes
_gif=auto _gif=auto
@ -1603,6 +1603,7 @@ _toolame=auto
_twolame=auto _twolame=auto
_tremor_internal=yes _tremor_internal=yes
_tremor_low=no _tremor_low=no
_tremor_external=no
_vorbis=auto _vorbis=auto
_speex=auto _speex=auto
_theora=auto _theora=auto
@ -1610,7 +1611,6 @@ _mp3lib=yes
_liba52=yes _liba52=yes
_libdts=auto _libdts=auto
_libmpeg2=yes _libmpeg2=yes
_tremor=no
_faad_internal=auto _faad_internal=auto
_faad_external=auto _faad_external=auto
_faac=auto _faac=auto
@ -1619,7 +1619,7 @@ _xmms=no
_have_dvd=no _have_dvd=no
_dvdnav=no _dvdnav=no
_dvdread=auto _dvdread=auto
_dvdkit=auto _mpdvdkit=auto
_xanim=auto _xanim=auto
_real=auto _real=auto
_live=auto _live=auto
@ -1741,8 +1741,8 @@ for ac_option do
--disable-nas) _nas=no ;; --disable-nas) _nas=no ;;
--enable-png) _png=yes ;; --enable-png) _png=yes ;;
--disable-png) _png=no ;; --disable-png) _png=no ;;
--enable-jpeg) _jpg=yes ;; --enable-jpeg) _jpeg=yes ;;
--disable-jpeg) _jpg=no ;; --disable-jpeg) _jpeg=no ;;
--enable-pnm) _pnm=yes ;; --enable-pnm) _pnm=yes ;;
--disable-pnm) _pnm=no ;; --disable-pnm) _pnm=no ;;
--enable-md5sum) _md5sum=yes ;; --enable-md5sum) _md5sum=yes ;;
@ -1809,12 +1809,12 @@ for ac_option do
--disable-vorbis) _vorbis=no ;; --disable-vorbis) _vorbis=no ;;
--enable-speex) _speex=yes ;; --enable-speex) _speex=yes ;;
--disable-speex) _speex=no ;; --disable-speex) _speex=no ;;
--enable-internal-tremor) _tremor_internal=yes ;; --enable-tremor-internal) _tremor_internal=yes ;;
--disable-internal-tremor) _tremor_internal=no ;; --disable-tremor-internal) _tremor_internal=no ;;
--enable-tremor-low) _tremor_low=yes ;; --enable-tremor-low) _tremor_low=yes ;;
--disable-tremor-low) _tremor_low=no ;; --disable-tremor-low) _tremor_low=no ;;
--enable-external-tremor) _tremor=yes ;; --enable-tremor-external) _tremor_external=yes ;;
--disable-external-tremor) _tremor=no ;; --disable-tremor-external) _tremor_external=no ;;
--enable-theora) _theora=yes ;; --enable-theora) _theora=yes ;;
--disable-theora) _theora=no ;; --disable-theora) _theora=no ;;
--enable-mp3lib) _mp3lib=yes ;; --enable-mp3lib) _mp3lib=yes ;;
@ -1827,10 +1827,10 @@ for ac_option do
--disable-libmpeg2) _libmpeg2=no ;; --disable-libmpeg2) _libmpeg2=no ;;
--enable-musepack) _musepack=yes ;; --enable-musepack) _musepack=yes ;;
--disable-musepack) _musepack=no ;; --disable-musepack) _musepack=no ;;
--enable-internal-faad) _faad_internal=yes _faad_external=no ;; --enable-faad-internal) _faad_internal=yes _faad_external=no ;;
--disable-internal-faad) _faad_internal=no ;; --disable-faad-internal) _faad_internal=no ;;
--enable-external-faad) _faad_external=yes _faad_internal=no ;; --enable-faad-external) _faad_external=yes _faad_internal=no ;;
--disable-external-faad) _faad_external=no ;; --disable-faad-external) _faad_external=no ;;
--enable-faac) _faac=yes ;; --enable-faac) _faac=yes ;;
--disable-faac) _faac=no ;; --disable-faac) _faac=no ;;
--enable-ladspa) _ladspa=yes ;; --enable-ladspa) _ladspa=yes ;;
@ -1839,8 +1839,8 @@ for ac_option do
--disable-xmms) _xmms=no ;; --disable-xmms) _xmms=no ;;
--enable-dvdread) _dvdread=yes ;; --enable-dvdread) _dvdread=yes ;;
--disable-dvdread) _dvdread=no ;; --disable-dvdread) _dvdread=no ;;
--enable-mpdvdkit) _dvdkit=yes ;; --enable-mpdvdkit) _mpdvdkit=yes ;;
--disable-mpdvdkit) _dvdkit=no ;; --disable-mpdvdkit) _mpdvdkit=no ;;
--enable-dvdnav) _dvdnav=yes ;; --enable-dvdnav) _dvdnav=yes ;;
--disable-dvdnav) _dvdnav=no ;; --disable-dvdnav) _dvdnav=no ;;
--enable-xanim) _xanim=yes ;; --enable-xanim) _xanim=yes ;;
@ -1885,8 +1885,8 @@ for ac_option do
--disable-smb) _smbsupport=no ;; --disable-smb) _smbsupport=no ;;
--enable-internal-vidix) _vidix_internal=yes ;; --enable-internal-vidix) _vidix_internal=yes ;;
--disable-internal-vidix) _vidix_internal=no ;; --disable-internal-vidix) _vidix_internal=no ;;
--enable-external-vidix) _vidix_external=yes ;; --enable-vidix-external) _vidix_external=yes ;;
--disable-external-vidix) _vidix_external=no ;; --disable-vidix-external) _vidix_external=no ;;
--enable-joystick) _joystick=yes ;; --enable-joystick) _joystick=yes ;;
--disable-joystick) _joystick=no ;; --disable-joystick) _joystick=no ;;
--enable-xvid) _xvid=yes ;; --enable-xvid) _xvid=yes ;;
@ -1921,16 +1921,16 @@ for ac_option do
--disable-libpostproc) _libpostproc=no ;; --disable-libpostproc) _libpostproc=no ;;
--enable-libpostproc_so) _libpostproc_so=yes ;; --enable-libpostproc_so) _libpostproc_so=yes ;;
--disable-libpostproc_so) _libpostproc_so=no ;; --disable-libpostproc_so) _libpostproc_so=no ;;
--enable-libfame) _fame=yes ;; --enable-libfame) _libfame=yes ;;
--disable-libfame) _fame=no ;; --disable-libfame) _libfame=no ;;
--enable-lirc) _lirc=yes ;; --enable-lirc) _lirc=yes ;;
--disable-lirc) _lirc=no ;; --disable-lirc) _lirc=no ;;
--enable-lircc) _lircc=yes ;; --enable-lircc) _lircc=yes ;;
--disable-lircc) _lircc=no ;; --disable-lircc) _lircc=no ;;
--enable-gui) _gui=yes ;; --enable-gui) _gui=yes ;;
--disable-gui) _gui=no ;; --disable-gui) _gui=no ;;
--enable-old-gtk) _gtk1=yes ;; --enable-gtk1) _gtk1=yes ;;
--disable-old-gtk) _gtk1=no ;; --disable-gtk1) _gtk1=no ;;
--enable-termcap) _termcap=yes ;; --enable-termcap) _termcap=yes ;;
--disable-termcap) _termcap=no ;; --disable-termcap) _termcap=no ;;
--enable-termios) _termios=yes ;; --enable-termios) _termios=yes ;;
@ -4342,8 +4342,8 @@ else
fi fi
echocheck "JPEG support" echocheck "JPEG support"
if test "$_jpg" = auto ; then if test "$_jpeg" = auto ; then
_jpg=no _jpeg=no
cat > $TMPC << EOF cat > $TMPC << EOF
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@ -4356,22 +4356,22 @@ int main(void) {
EOF EOF
if cc_check -ljpeg $_ld_lm ; then if cc_check -ljpeg $_ld_lm ; then
if tmp_run ; then if tmp_run ; then
_jpg=yes _jpeg=yes
fi fi
fi fi
fi fi
echores "$_jpg" echores "$_jpeg"
if test "$_jpg" = yes ; then if test "$_jpeg" = yes ; then
_def_jpg='#define HAVE_JPEG 1' _def_jpeg='#define HAVE_JPEG 1'
_vosrc="$_vosrc vo_jpeg.c" _vosrc="$_vosrc vo_jpeg.c"
_vomodules="jpeg $_vomodules" _vomodules="jpeg $_vomodules"
_ld_jpg="-ljpeg" _ld_jpeg="-ljpeg"
_mkf_jpg="yes" _mkf_jpeg="yes"
else else
_def_jpg='#undef HAVE_JPEG' _def_jpeg='#undef HAVE_JPEG'
_novomodules="jpeg $_novomodules" _novomodules="jpeg $_novomodules"
_mkf_jpg="no" _mkf_jpeg="no"
fi fi
@ -4712,27 +4712,27 @@ echores "$_mp1e"
echocheck "libfame" echocheck "libfame"
if test "$_fame" = auto ; then if test "$_libfame" = auto ; then
_fame=no _libfame=no
test "$_dxr2" = yes && _fame=auto test "$_dxr2" = yes && _libfame=auto
test "$_dxr3" = yes && _fame=auto test "$_dxr3" = yes && _libfame=auto
test "$_dvb" = yes && _fame=auto test "$_dvb" = yes && _libfame=auto
fi fi
if test "$_fame" = auto ; then if test "$_libfame" = auto ; then
_fame=no _libfame=no
if test -d libfame && test -f libfame/fame.h ; then if test -d libfame && test -f libfame/fame.h ; then
# disable fame on cygwin as no sense to port - atmos # disable libfame on Cygwin as porting makes no sense
cygwin || _fame=yes cygwin || _libfame=yes
else else
_res_comment="no fame dir" _res_comment="no libfame dir"
fi fi
fi fi
echores "$_fame" echores "$_libfame"
_def_fame='#undef USE_LIBFAME' _def_libfame='#undef USE_LIBFAME'
if test "$_fame" = yes ; then if test "$_libfame" = yes ; then
_def_fame='#define USE_LIBFAME 1' _def_libfame='#define USE_LIBFAME 1'
_ld_fame='libfame/libfame.a' _ld_libfame='libfame/libfame.a'
fi fi
@ -5103,13 +5103,13 @@ echores "$_vcd"
echocheck "DVD support (libmpdvdkit2)" echocheck "DVD support (libmpdvdkit2)"
if test "$_dvdkit" = auto ; then if test "$_mpdvdkit" = auto ; then
_dvdkit=no _mpdvdkit=no
if linux || freebsd || netbsd || darwin || openbsd || win32 || sunos || hpux; then if linux || freebsd || netbsd || darwin || openbsd || win32 || sunos || hpux; then
test -f "./libmpdvdkit2/Makefile" && _dvdkit=yes test -f "./libmpdvdkit2/Makefile" && _mpdvdkit=yes
fi fi
fi fi
if test "$_dvdkit" = yes ; then if test "$_mpdvdkit" = yes ; then
if test "$_dvd" = yes || test "$_cdrom" = yes || test "$_cdio" = yes || test "$_dvdio" = yes || test "$_bsdi_dvd" = yes || test "$_hpux_scsi_h" = yes || darwin || win32 ; then if test "$_dvd" = yes || test "$_cdrom" = yes || test "$_cdio" = yes || test "$_dvdio" = yes || test "$_bsdi_dvd" = yes || test "$_hpux_scsi_h" = yes || darwin || win32 ; then
_inputmodules="mpdvdkit2 $_inputmodules" _inputmodules="mpdvdkit2 $_inputmodules"
_dvdread=libmpdvdkit2 _dvdread=libmpdvdkit2
@ -5137,7 +5137,7 @@ if test "$_dvdkit" = yes ; then
else else
_noinputmodules="mpdvdkit2 $_noinputmodules" _noinputmodules="mpdvdkit2 $_noinputmodules"
fi fi
echores "$_dvdkit" echores "$_mpdvdkit"
echocheck "DVD support (libdvdread)" echocheck "DVD support (libdvdread)"
if test "$_dvdread" = auto ; then if test "$_dvdread" = auto ; then
@ -5203,7 +5203,7 @@ EOF
fi fi
test -z "$_dvdnavdir" && test -n "$_dvdnavconfig" && _dvdnavdir=`$_dvdnavconfig --cflags` test -z "$_dvdnavdir" && test -n "$_dvdnavconfig" && _dvdnavdir=`$_dvdnavconfig --cflags`
_used_css= _used_css=
#test "$_dvdkit" = no && _used_css=$_ld_css #test "$_mpdvdkit" = no && _used_css=$_ld_css
cc_check $_inc_extra -I$_dvdnavdir $_legal_dvdnavdir -ldvdnav $_used_css $_ld_dl $_ld_pthread && _dvdnav=yes cc_check $_inc_extra -I$_dvdnavdir $_legal_dvdnavdir -ldvdnav $_used_css $_ld_dl $_ld_pthread && _dvdnav=yes
fi fi
if test "$_dvdnav" = yes ; then if test "$_dvdnav" = yes ; then
@ -5597,7 +5597,7 @@ if test "$_vorbis" = yes ; then
_tremor_flags='' _tremor_flags=''
fi fi
_codecmodules="tremor(internal) $_codecmodules" _codecmodules="tremor(internal) $_codecmodules"
elif test "$_tremor" = yes ; then elif test "$_tremor_external" = yes ; then
_def_tremor='#define TREMOR 1' _def_tremor='#define TREMOR 1'
_ld_vorbis='-lvorbisidec' _ld_vorbis='-lvorbisidec'
_codecmodules="tremor $_codecmodules" _codecmodules="tremor $_codecmodules"
@ -5615,8 +5615,8 @@ if test "$_vorbis" = yes -a "$_tremor_internal" = yes -a "$_tremor_low" = yes ;
_res_comment="internal low accuracy Tremor" _res_comment="internal low accuracy Tremor"
elif test "$_vorbis" = yes -a "$_tremor_internal" = yes ; then elif test "$_vorbis" = yes -a "$_tremor_internal" = yes ; then
_res_comment="internal Tremor" _res_comment="internal Tremor"
elif test "$_vorbis" = yes -a "$_tremor" = yes ; then elif test "$_vorbis" = yes -a "$_tremor_external" = yes ; then
_res_comment="Tremor" _res_comment="external Tremor"
fi fi
echores "$_vorbis" echores "$_vorbis"
@ -7415,7 +7415,7 @@ MUSEPACK = $_musepack
UNRARLIB = $_unrarlib UNRARLIB = $_unrarlib
PNG = $_mkf_png PNG = $_mkf_png
JPEG = $_mkf_jpg JPEG = $_mkf_jpeg
GIF = $_mkf_gif GIF = $_mkf_gif
EXTRA_LIB = $_ld_extra EXTRA_LIB = $_ld_extra
@ -7447,7 +7447,7 @@ MLIB_INC = $_inc_mlib
DXR2_INC = $_inc_dxr2 DXR2_INC = $_inc_dxr2
DVB_INC = $_inc_dvb DVB_INC = $_inc_dvb
PNG_LIB = $_ld_png PNG_LIB = $_ld_png
JPEG_LIB = $_ld_jpg JPEG_LIB = $_ld_jpeg
GIF_LIB = $_ld_gif GIF_LIB = $_ld_gif
SDL_LIB = $_ld_sdl SDL_LIB = $_ld_sdl
SVGA_LIB = $_ld_svga SVGA_LIB = $_ld_svga
@ -7478,7 +7478,7 @@ LIRCC_LIB = $_ld_lircc
HAVE_DVD = $_have_dvd HAVE_DVD = $_have_dvd
DVDREAD = $_dvdread DVDREAD = $_dvdread
DVDREAD_LIB = $_ld_dvdread DVDREAD_LIB = $_ld_dvdread
DVDKIT2 = $_dvdkit DVDKIT2 = $_mpdvdkit
DVDNAV_LIB = $_ld_dvdnav DVDNAV_LIB = $_ld_dvdnav
SDL_INC = $_inc_sdl SDL_INC = $_inc_sdl
W32_DEP = $_dep_win32 W32_DEP = $_dep_win32
@ -7496,8 +7496,8 @@ CONFIG_LIBAVFORMAT_SO = $_libavformat_so
CONFIG_LIBPOSTPROC = $_libpostproc CONFIG_LIBPOSTPROC = $_libpostproc
CONFIG_LIBPOSTPROC_SO = $_libpostproc_so CONFIG_LIBPOSTPROC_SO = $_libpostproc_so
ZORAN = $_zr ZORAN = $_zr
FAME = $_fame FAME = $_libfame
FAME_LIB = $_ld_fame FAME_LIB = $_ld_libfame
MP1E_DEP = $_dep_mp1e MP1E_DEP = $_dep_mp1e
MP1E_LIB = $_ld_mp1e MP1E_LIB = $_ld_mp1e
ARCH_LIB = $_ld_arch $_ld_iconv ARCH_LIB = $_ld_arch $_ld_iconv
@ -7939,7 +7939,7 @@ $_def_libdts
$_def_libmpeg2 $_def_libmpeg2
/* Use libfame encoder filter */ /* Use libfame encoder filter */
$_def_fame $_def_libfame
/* XAnim DLL support */ /* XAnim DLL support */
$_def_xanim $_def_xanim
@ -8099,7 +8099,7 @@ $_def_termios_sys_h
$_def_png $_def_png
/* enable JPEG support */ /* enable JPEG support */
$_def_jpg $_def_jpeg
/* enable PNM support */ /* enable PNM support */
$_def_pnm $_def_pnm