diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-03-10 23:59:38 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-03-10 23:59:38 +0000 |
| commit | 349e0f199c94b87ce5499b5d8368101db2aae0a3 (patch) | |
| tree | 3fbcf62c5014a467990b218606babd3584e1f314 /configure | |
| parent | bb682fcc422d316caf44ab98873e36127f1d4e6a (diff) | |
| download | mpv-349e0f199c94b87ce5499b5d8368101db2aae0a3.tar.bz2 mpv-349e0f199c94b87ce5499b5d8368101db2aae0a3.tar.xz | |
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
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17807 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -5189,7 +5189,9 @@ int main() 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 @@ if test "$_libcdio" = yes && test "$_cdparanoia" = no ; then _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)" |