Mercurial > mplayer.hg

changeset 20491:5e0e85780d5e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Factor out common cdda stuff from cdio and cdparanoia tests. Also fixes configure showing cdda as both en- and disabled with libcdio.
author reimar
date Sun, 29 Oct 2006 11:38:14 +0000
parents eed38650b528
children 0b563edd9b3a
files configure
diffstat 1 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/configure	Sun Oct 29 11:17:28 2006 +0000
+++ b/configure	Sun Oct 29 11:38:14 2006 +0000
@@ -5286,13 +5286,8 @@
 fi
 if test "$_cdparanoia" = yes ; then
     _cdda='yes'
-    _def_cdparanoia='#define HAVE_CDDA'
-    _inputmodules="cdda $_inputmodules"
     _ld_cdparanoia="$_ld_cdparanoia -lcdda_interface -lcdda_paranoia"
     openbsd && _ld_cdparanoia="$_ld_cdparanoia -lutil"
-else
-    _def_cdparanoia='#undef HAVE_CDDA'
-    _noinputmodules="cdda $_noinputmodules"
 fi
 echores "$_cdparanoia"
 
@@ -5324,9 +5319,7 @@
 if test "$_libcdio" = yes && test "$_cdparanoia" = no ; then
     _cdda='yes'
     _def_libcdio='#define HAVE_LIBCDIO'
-    _def_cdparanoia='#define HAVE_CDDA'
     _def_havelibcdio='yes'
-    _inputmodules="cdda $_inputmodules"
     _inc_extra="$_inc_extra `pkg-config --cflags libcdio`"
     _ld_libcdio=`pkg-config --libs libcdio_paranoia`
 else
@@ -5338,6 +5331,13 @@
 fi
 echores "$_libcdio"
 
+if test "$_cdda" = yes ; then
+    _def_cdparanoia='#define HAVE_CDDA'
+    _inputmodules="cdda $_inputmodules"
+else
+    _def_cdparanoia='#undef HAVE_CDDA'
+    _noinputmodules="cdda $_noinputmodules"
+fi
 
 echocheck "bitmap font support"
 if test "$_bitmap_font" = yes ; then