summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-08-31 19:00:09 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-08-31 19:00:09 +0000
commit63a2e5b07f39b109e087f3ec6002111ed9c0c22f (patch)
treebaa637330b936ce8b45cc07f8aa0701186af172d
parent04e2fc23360719c785dab928df910132e3789298 (diff)
downloadmpv-63a2e5b07f39b109e087f3ec6002111ed9c0c22f.tar.bz2
mpv-63a2e5b07f39b109e087f3ec6002111ed9c0c22f.tar.xz
Check for requirements at configure-time, not at run-time.
patch by Vladimir Voroshilov, voroshil <at> gmail <dot> com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19614 b3059339-0415-0410-9bf9-f77b7e298cf2
-rwxr-xr-xconfigure3
-rw-r--r--stream/stream_radio.c6
2 files changed, 4 insertions, 5 deletions
diff --git a/configure b/configure
index eceaaf2b29..fd2f93d092 100755
--- a/configure
+++ b/configure
@@ -6720,6 +6720,9 @@ else
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
diff --git a/stream/stream_radio.c b/stream/stream_radio.c
index 44b88e859b..b5e8de2fdb 100644
--- a/stream/stream_radio.c
+++ b/stream/stream_radio.c
@@ -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>