[MPlayer-cvslog] CVS: main configure,1.1141,1.1142

[Diego Biurrun CVS]

CVS change done by Diego Biurrun CVS

Update of /cvsroot/mplayer/main
In directory mail:/var2/tmp/cvs-serv129

Modified Files:
	configure 
Log Message:
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


Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.1141
retrieving revision 1.1142
diff -u -r1.1141 -r1.1142
--- configure	8 Mar 2006 20:27:47 -0000	1.1141
+++ configure	10 Mar 2006 23:59:38 -0000	1.1142
@@ -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)"