summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xconfigure2
-rw-r--r--stream/Makefile4
2 files changed, 3 insertions, 3 deletions
diff --git a/configure b/configure
index a756eead9a..5948ff6953 100755
--- a/configure
+++ b/configure
@@ -5226,6 +5226,7 @@ if test "$_cdparanoia" = yes ; then
_cdda='yes'
_ld_extra="$_ld_extra -lcdda_interface -lcdda_paranoia"
openbsd && _ld_extra="$_ld_extra -lutil"
+ test $_network = yes && _cddb=yes
fi
echores "$_cdparanoia"
@@ -7434,6 +7435,7 @@ CONFIG_DTS = $_libdts
MPLAYER = $_mplayer
MENCODER = $_mencoder
CDDA = $_cdda
+CDDB = $_cddb
BITMAP_FONT = $_bitmap_font
FREETYPE = $_freetype
CONFIG_ASS = $_ass
diff --git a/stream/Makefile b/stream/Makefile
index b6a080ea37..9c5e7d7d8c 100644
--- a/stream/Makefile
+++ b/stream/Makefile
@@ -12,6 +12,7 @@ SRCS += open.c \
url.c \
SRCS-$(CDDA) += stream_cdda.c cdinfo.c
+SRCS-$(CDDB) += stream_cddb.c
SRCS-$(DVBIN) += dvb_tune.c stream_dvb.c
SRCS-$(DVDNAV) += stream_dvdnav.c
SRCS-$(DVDREAD) += stream_dvd.c
@@ -55,9 +56,6 @@ SRCS-$(VCD) += stream_vcd.c
SRCS-$(VSTREAM) += stream_vstream.c
#FIXME: These should have variables assigned in configure.
-ifeq ($(CDDA),yes)
-SRCS-$(MPLAYER_NETWORK) += stream_cddb.c
-endif
ifeq ($(TV_V4L),yes)
SRCS-$(ALSA1X) += ai_alsa1x.c
SRCS-$(ALSA9) += ai_alsa.c