Mercurial > mplayer.hg

changeset 17807:764d224f2cb4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Simplify libcdio check.
author diego
date Sat, 11 Mar 2006 00:00:25 +0000
parents 19096bce8095
children 278206dd6fbd
files configure
diffstat 1 files changed, 2 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/configure	Fri Mar 10 23:59:38 2006 +0000
+++ b/configure	Sat Mar 11 00:00:25 2006 +0000
@@ -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'