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

[Diego Biurrun CVS]

CVS change done by Diego Biurrun CVS

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

Modified Files:
	configure 
Log Message:
Simplify libcdio check.


Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.1142
retrieving revision 1.1143
diff -u -r1.1142 -r1.1143
--- configure	10 Mar 2006 23:59:38 -0000	1.1142
+++ configure	11 Mar 2006 00:00:25 -0000	1.1143
@@ -5189,7 +5189,7 @@
 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_paranoia` $_inc_tmp $_ld_libcdio $_ld_lm \
+        cc_check `pkg-config --cflags --libs libcdio_paranoia` $_inc_tmp $_ld_lm \
             && _inc_libcdio="$_inc_tmp" && ( $TMPO >> "$TMPLOG" ) \
             && _libcdio=yes && break
     done
@@ -5206,9 +5206,7 @@
     _ld_libcdio=`pkg-config --libs libcdio_paranoia`
 else
     if test "$_cdparanoia" = yes ; then
-       _libcdio="no (using cdparanoia)"
-    else
-       _libcdio=no
+       _res_comment="(using cdparanoia)"
     fi
     _def_libcdio='#undef HAVE_LIBCDIO'
     _def_havelibcdio='no'