[MPlayer-cvslog] r21342 - in trunk: configure stream/Makefile

[diego]

Author: diego
Date: Mon Nov 27 23:02:06 2006
New Revision: 21342

Modified:
   trunk/configure
   trunk/stream/Makefile

Log:
Add a config.mak variable for CDDB.


Modified: trunk/configure
==============================================================================
--- trunk/configure	(original)
+++ trunk/configure	Mon Nov 27 23:02:06 2006
@@ -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

Modified: trunk/stream/Makefile
==============================================================================
--- trunk/stream/Makefile	(original)
+++ trunk/stream/Makefile	Mon Nov 27 23:02:06 2006
@@ -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