[MPlayer-cvslog] r19614 - in trunk: configure stream/stream_radio.c

[diego]

Author: diego
Date: Thu Aug 31 21:00:09 2006
New Revision: 19614

Modified:
   trunk/configure
   trunk/stream/stream_radio.c

Log:
Check for requirements at configure-time, not at run-time.
patch by Vladimir Voroshilov, voroshil <at> gmail <dot> com


Modified: trunk/configure
==============================================================================
--- trunk/configure	(original)
+++ trunk/configure	Thu Aug 31 21:00:09 2006
@@ -6720,6 +6720,9 @@
 fi
 echores "$_radio_v4l"
 
+if test "$_radio_v4l" = no && test "$_radio_v4l2" = no && test "$_radio" = yes ; then
+    die "Radio driver requires V4L or V4L2!"
+fi
 
 echocheck "Video 4 Linux 2/IVTV PVR interface"
 if test "$_pvr" = auto ; then

Modified: trunk/stream/stream_radio.c
==============================================================================
--- trunk/stream/stream_radio.c	(original)
+++ trunk/stream/stream_radio.c	Thu Aug 31 21:00:09 2006
@@ -1,5 +1,3 @@
-
-#include "config.h"
 /*
  *     Radio support
  * 
@@ -32,9 +30,7 @@
 #undef USE_RADIO_CAPTURE
 #endif
 
-#if !defined(HAVE_RADIO_V4L) && !defined(HAVE_RADIO_V4L2)
-#error "This driver requires V4L1 or V4L2!"
-#endif
+#include "config.h"
 
 #include <stdlib.h>
 #include <stdio.h>