diff configure @ 23573:21c28c2645fe

Revert r23530. r23530 breaks policy: notification was not sent to mailing list, agreements of other devs were not received. Code also should be reviewed/cleaned up/fixed.
author voroshil
date Thu, 21 Jun 2007 08:18:51 +0000
parents 4ce659b6f501
children e180f4d46593
line wrap: on
line diff
--- a/configure	Wed Jun 20 18:19:03 2007 +0000
+++ b/configure	Thu Jun 21 08:18:51 2007 +0000
@@ -240,7 +240,6 @@
   --disable-tv-v4l1      disable Video4Linux TV interface [autodetect]
   --disable-tv-v4l2      disable Video4Linux2 TV interface [autodetect]
   --disable-tv-bsdbt848  disable BSD BT848 interface [autodetect]
-  --disable-tv-teletex   disable TV teletext interface [autodetect]
   --disable-pvr          disable Video4Linux2 MPEG PVR [autodetect]
   --disable-rtc          disable RTC (/dev/rtc) on Linux [autodetect]
   --disable-network      disable networking [enable]
@@ -589,7 +588,6 @@
 _tv_v4l1=auto
 _tv_v4l2=auto
 _tv_bsdbt848=auto
-_tv_teletext=auto
 _pvr=auto
 _network=yes
 _winsock2=auto
@@ -937,8 +935,6 @@
   --disable-tv-v4l1)	_tv_v4l1=no	;;
   --enable-tv-v4l2)	_tv_v4l2=yes	;;
   --disable-tv-v4l2)	_tv_v4l2=no	;;
-  --enable-tv-teletext)    _tv_teletext=yes        ;;
-  --disable-tv-teletext)    _tv_teletext=no        ;;
   --enable-radio)       _radio=yes	;;
   --enable-radio-capture)       _radio_capture=yes	;;
   --disable-radio-capture)       _radio_capture=no	;;
@@ -6674,28 +6670,6 @@
 fi
 echores "$_tv_v4l2"
 
-echocheck "TV teletext interface"
-if test "$_tv_teletext" = auto ; then
- _tv_teletext=no
- if test linux ; then
-  cat > $TMPC <<EOF
-#include <stdlib.h>
-#include <libzvbi.h>
-int main(void) { return 0; }
-EOF
-  cc_check && _tv_teletext=yes
- fi
-fi
-if test "$_tv_teletext" = yes ; then
-  _def_tv_teletext='#define HAVE_TV_TELETEXT 1'
-  _ld_extra="$_ld_extra -lzvbi"
-  _inputmodules="tv-teletext $_inputmodules"
-else
-  _noinputmodules="tv-teletext $_noinputmodules"
-  _def_tv_teletext='#undef HAVE_TV_TELETEXT'
-fi
-echores "$_tv_teletext"
-
 
 echocheck "Radio interface"
 if test "$_radio" = yes ; then
@@ -7560,7 +7534,6 @@
 TV_V4L1 = $_tv_v4l1
 TV_V4L2 = $_tv_v4l2
 TV_BSDBT848 = $_tv_bsdbt848
-TV_TELETEXT = $_tv_teletext
 AUDIO_INPUT = $_audio_input
 PVR = $_pvr
 VCD = $_vcd
@@ -8126,9 +8099,6 @@
 /* Enable *BSD BrookTree TV interface support */
 $_def_tv_bsdbt848
 
-/* Enable TV Teletext Interface support */
-$_def_tv_teletext
-
 /* Enable Radio Interface support */
 $_def_radio