Mercurial > mplayer.hg

changeset 21326:af809f05ed57

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add a config.mak variable for CDDB.
author diego
date Mon, 27 Nov 2006 22:02:06 +0000
parents 963e85e82154
children 40db8a91e674
files configure stream/Makefile
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/configure	Mon Nov 27 21:59:13 2006 +0000
+++ b/configure	Mon Nov 27 22:02:06 2006 +0000
@@ -5226,6 +5226,7 @@
     _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 @@
 MPLAYER = $_mplayer
 MENCODER = $_mencoder
 CDDA = $_cdda
+CDDB = $_cddb
 BITMAP_FONT = $_bitmap_font
 FREETYPE = $_freetype
 CONFIG_ASS = $_ass
--- a/stream/Makefile	Mon Nov 27 21:59:13 2006 +0000
+++ b/stream/Makefile	Mon Nov 27 22:02:06 2006 +0000
@@ -12,6 +12,7 @@
         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-$(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