Mercurial > mplayer.hg
changeset 17806:19096bce8095
Make better use of pkg-config to check for/set proper libraries when
using libcdio with internal cdparanoia.
patch by Erik Lunchpail erik_27can <<at>> yahoo <<dot>> com
| author | diego |
|---|---|
| date | Fri, 10 Mar 2006 23:59:38 +0000 |
| parents | ff000b249bd9 |
| children | 764d224f2cb4 |
| files | configure |
| diffstat | 1 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Fri Mar 10 23:51:41 2006 +0000 +++ b/configure Fri Mar 10 23:59:38 2006 +0000 @@ -5189,7 +5189,9 @@ EOF _libcdio=no for _inc_tmp in "$_inc_libcdio" "-I/usr/include/cdio" "-I/usr/local/include/cdio" ; do - cc_check `pkg-config --cflags --libs libcdio` $_inc_tmp $_ld_libcdio -lcdio_cdda -lcdio_paranoia $_ld_lm && _inc_libcdio="$_inc_tmp" && ( $TMPO >> "$TMPLOG" ) && _libcdio=yes && break + cc_check `pkg-config --cflags --libs libcdio_paranoia` $_inc_tmp $_ld_libcdio $_ld_lm \ + && _inc_libcdio="$_inc_tmp" && ( $TMPO >> "$TMPLOG" ) \ + && _libcdio=yes && break done else _libcdio=no @@ -5201,8 +5203,7 @@ _def_havelibcdio='yes' _inputmodules="cdda $_inputmodules" _inc_libcdio=`pkg-config --cflags libcdio` - _ld_libcdio=`pkg-config --libs libcdio` - _ld_cdparanoia="$_ld_cdparanoia -lcdio_cdda -lcdio_paranoia -lcdio" + _ld_libcdio=`pkg-config --libs libcdio_paranoia` else if test "$_cdparanoia" = yes ; then _libcdio="no (using cdparanoia)"