diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-04-22 20:43:28 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2007-04-22 20:43:28 +0000 |
| commit | 2fbdb552895714bd3ee54cf6b2cd2558948bdf75 (patch) | |
| tree | e00a12061bdcfe35d5e7335c4cdb0f8e20ec7740 | |
| parent | effc6dcf23d54cd29e82a5dcfdca04f9432083b8 (diff) | |
| download | mpv-2fbdb552895714bd3ee54cf6b2cd2558948bdf75.tar.bz2 mpv-2fbdb552895714bd3ee54cf6b2cd2558948bdf75.tar.xz | |
Add Makefile variable for audio input that is enabled by V4L or radio capture.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23088 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rwxr-xr-x | configure | 3 | ||||
| -rw-r--r-- | stream/Makefile | 8 |
2 files changed, 4 insertions, 7 deletions
@@ -6794,6 +6794,7 @@ EOF fi fi if test "$_tv_v4l1" = yes ; then + _audio_input=yes _tv_v4l=yes _def_tv_v4l='#define HAVE_TV_V4L 1' _def_tv_v4l1='#define HAVE_TV_V4L1 1' @@ -6838,6 +6839,7 @@ if test "$_radio" = yes ; then _radio_capture=no fi if test "$_radio_capture" = yes ; then + _audio_input=yes _def_radio_capture="#define USE_RADIO_CAPTURE 1" else _def_radio_capture="#undef USE_RADIO_CAPTURE" @@ -7736,6 +7738,7 @@ TV_V4L = $_tv_v4l TV_V4L1 = $_tv_v4l1 TV_V4L2 = $_tv_v4l2 TV_BSDBT848 = $_tv_bsdbt848 +AUDIO_INPUT = $_audio_input PVR = $_pvr VCD = $_vcd DVDREAD = $_dvdread diff --git a/stream/Makefile b/stream/Makefile index d27a45a700..a5d7edcf37 100644 --- a/stream/Makefile +++ b/stream/Makefile @@ -54,13 +54,7 @@ SRCS_COMMON-$(TV_V4L2) += tvi_v4l2.c audio_in.c SRCS_COMMON-$(VCD) += stream_vcd.c SRCS_COMMON-$(VSTREAM) += stream_vstream.c -#FIXME: These should have variables assigned in configure. -ifeq ($(TV_V4L),yes) -SRCS_COMMON-$(ALSA1X) += ai_alsa1x.c -SRCS_COMMON-$(ALSA9) += ai_alsa.c -SRCS_COMMON-$(OSS) += ai_oss.c -endif -ifeq ($(RADIO_CAPTURE),yes) +ifeq ($(AUDIO_INPUT),yes) SRCS_COMMON-$(ALSA1X) += ai_alsa1x.c SRCS_COMMON-$(ALSA9) += ai_alsa.c SRCS_COMMON-$(OSS) += ai_oss.c |