Mercurial > mplayer.hg
changeset 19608:18a538908577
Check for requirements at configure-time, not at run-time.
patch by Vladimir Voroshilov, voroshil <at> gmail <dot> com
| author | diego |
|---|---|
| date | Thu, 31 Aug 2006 19:00:09 +0000 |
| parents | f83205ac7cfb |
| children | b9babb64ca2a |
| files | configure stream/stream_radio.c |
| diffstat | 2 files changed, 4 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Thu Aug 31 18:43:53 2006 +0000 +++ b/configure Thu Aug 31 19:00:09 2006 +0000 @@ -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
--- a/stream/stream_radio.c Thu Aug 31 18:43:53 2006 +0000 +++ b/stream/stream_radio.c Thu Aug 31 19:00:09 2006 +0000 @@ -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>