summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-03-11 00:00:25 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-03-11 00:00:25 +0000
commit1b1a9c91636245f497f6a6b3621f7a1a0a141de1 (patch)
tree4139f00ce04d93414df114f78b34c9439d74d21a /configure
parent349e0f199c94b87ce5499b5d8368101db2aae0a3 (diff)
downloadmpv-1b1a9c91636245f497f6a6b3621f7a1a0a141de1.tar.bz2
mpv-1b1a9c91636245f497f6a6b3621f7a1a0a141de1.tar.xz
Simplify libcdio check.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17808 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure6
1 files changed, 2 insertions, 4 deletions
diff --git a/configure b/configure
index 67215d6a2b..6f022f5f7e 100755
--- a/configure
+++ b/configure
@@ -5189,7 +5189,7 @@ 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_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 @@ if test "$_libcdio" = yes && test "$_cdparanoia" = no ; then
_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'