RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-02-23 16:36:56 +00:00
Code Issues Releases Wiki Activity

Factor out common cdda stuff from cdio and cdparanoia tests.

Browse Source 
Also fixes configure showing cdda as both en- and disabled with libcdio.


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20507 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2006-10-29 11:38:14 +00:00
parent 3675d0466d
commit 7006b27bb8
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
configure vendored
View File

@ -5286,13 +5286,8 @@ EOF
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 @@ fi
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 @@ else
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