Mercurial > mplayer.hg

changeset 26921:6166ee42b6d4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
disable dvdnav when using the internal dvdread
author nicodvb
date Sun, 01 Jun 2008 07:44:36 +0000
parents 946c9ba2188b
children cfad7bcf91cc
files configure
diffstat 1 files changed, 5 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/configure	Sun Jun 01 07:32:28 2008 +0000
+++ b/configure	Sun Jun 01 07:44:36 2008 +0000
@@ -7544,7 +7544,12 @@
 # to use its own copy of the library)
 echocheck "DVD support (libdvdnav)"
 if test "$_dvdnav" = auto ; then
+  if test "$_dvdread_internal" = yes ; then
+    _dvdnav=no
+    echores "disabled due to the usage of the internal copy of dvdread. Append --disable-dvdread-internal"
+  else
   $_dvdnavconfig --version --minilibs >> $TMPLOG 2>&1 || _dvdnav=no
+  fi
 fi
 if test "$_dvdnav" = auto ; then
   cat > $TMPC <<EOF