Mercurial > mplayer.hg
diff configure @ 19187:97ea9a6616df
Rename *v4l variable to *v4l1.
author | diego |
---|---|
date | Thu, 27 Jul 2006 09:30:39 +0000 (2006-07-27) |
parents | d9656bb2ae0e |
children | 0506fc913c27 |
line wrap: on
line diff
--- a/configure Wed Jul 26 22:43:20 2006 +0000 +++ b/configure Thu Jul 27 09:30:39 2006 +0000 @@ -217,7 +217,7 @@ --disable-vm disable support X video mode extensions [autodetect] --disable-xf86keysym disable support for 'multimedia' keys [autodetect] --disable-tv disable TV Interface (tv/dvb grabbers) [enable] - --disable-tv-v4l disable Video4Linux TV Interface support [autodetect] + --disable-tv-v4l1 disable Video4Linux TV Interface support [autodetect] --disable-tv-v4l2 disable Video4Linux2 TV Interface support [autodetect] --disable-tv-bsdbt848 disable BSD BT848 Interface support [autodetect] --disable-pvr disable Video4Linux2/IVTV PVR support [autodetect] @@ -1649,7 +1649,7 @@ _win32=auto _select=yes _tv=yes -_tv_v4l=auto +_tv_v4l1=auto _tv_v4l2=auto _tv_bsdbt848=auto _pvr=auto @@ -1884,8 +1884,8 @@ --disable-tv) _tv=no ;; --enable-tv-bsdbt848) _tv_bsdbt848=yes ;; --disable-tv-bsdbt848) _tv_bsdbt848=no ;; - --enable-tv-v4l) _tv_v4l=yes ;; - --disable-tv-v4l) _tv_v4l=no ;; + --enable-tv-v4l1) _tv_v4l1=yes ;; + --disable-tv-v4l1) _tv_v4l1=no ;; --enable-tv-v4l2) _tv_v4l2=yes ;; --disable-tv-v4l2) _tv_v4l2=no ;; --enable-pvr) _pvr=yes ;; @@ -2966,7 +2966,7 @@ else _res_comment="v4l, vo_gl, ao_alsa, ao_nas, ao_macosx, win32 loader disabled" _def_pthreads='#undef HAVE_PTHREADS' - _nas=no ; _tv_v4l=no ; _macosx=no + _nas=no ; _tv_v4l1=no ; _macosx=no if not mingw32 ; then _win32=no fi @@ -6683,25 +6683,25 @@ echocheck "Video 4 Linux TV interface" -if test "$_tv_v4l" = auto ; then - _tv_v4l=no +if test "$_tv_v4l1" = auto ; then + _tv_v4l1=no if test "$_tv" = yes && linux ; then cat > $TMPC <<EOF #include <stdlib.h> #include <linux/videodev.h> int main(void) { return 0; } EOF - cc_check && _tv_v4l=yes + cc_check && _tv_v4l1=yes fi fi -if test "$_tv_v4l" = yes ; then - _def_tv_v4l='#define HAVE_TV_V4L 1' +if test "$_tv_v4l1" = yes ; then + _def_tv_v4l1='#define HAVE_TV_V4L1 1' _inputmodules="tv-v4l $_inputmodules" else - _noinputmodules="tv-v4l $_noinputmodules" + _noinputmodules="tv-v4l1 $_noinputmodules" _def_tv_v4l='#undef HAVE_TV_V4L' fi -echores "$_tv_v4l" +echores "$_tv_v4l1" echocheck "Video 4 Linux 2 TV interface" @@ -7436,7 +7436,7 @@ LIRC_LIB = $_ld_lirc LIRCC_LIB = $_ld_lircc TV = $_tv -TV_V4L = $_tv_v4l +TV_V4L1 = $_tv_v4l1 TV_V4L2 = $_tv_v4l2 TV_BSDBT848 = $_tv_bsdbt848 PVR = $_pvr @@ -7963,8 +7963,8 @@ /* Enable TV Interface support */ $_def_tv -/* Enable Video 4 Linux TV interface support */ -$_def_tv_v4l +/* Enable Video 4 Linux 1 TV interface support */ +$_def_tv_v4l1 /* Enable Video 4 Linux 2 TV interface support */ $_def_tv_v4l2