# HG changeset patch # User diego # Date 1142035225 0 # Node ID 764d224f2cb4470b919d359ede98f8d16ce05bb0 # Parent 19096bce80951be2e486822dfb292f967caa2b08 Simplify libcdio check. diff -r 19096bce8095 -r 764d224f2cb4 configure --- 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'