[MPlayer-dev-eng] [PATCH] don't use libdvdnavmini

[Dominik 'Rathann' Mierzejewski]

Hi,

Since MPlayer no longer supports libdvdnav with its internal libdvdread,
we shouldn't try to link against the minilib, but use the regular
libdvdnav instead.
With this, libdvdnavmini generation can be removed from libdvdnav,
though I'll leave that decision to Nico.

Regards,
R.

-- 
MPlayer http://mplayerhq.hu | Livna http://rpm.livna.org
There should be a science of discontent. People need hard times and
oppression to develop psychic muscles.
	-- from "Collected Sayings of Muad'Dib" by the Princess Irulan
-------------- next part --------------
Index: configure
===================================================================
--- configure	(revision 27490)
+++ configure	(working copy)
@@ -7661,13 +7661,9 @@
 #because libdvdnavmini is intentionally not linked against libdvdread (to permit mplayer
 # to use its own copy of the library)
 echocheck "DVD support (libdvdnav)"
-if test "$_dvdnav" = auto ; then
-  if test "$_dvdread_internal" = yes ; then
+if test "$_dvdnav" = auto && test "$_dvdread_internal" = yes ; then
     _dvdnav=no
     _res_comment="Disabled in favor 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
@@ -7683,8 +7679,8 @@
 if test "$_dvdnav" = yes ; then
   _largefiles=yes
   _def_dvdnav='#define CONFIG_DVDNAV 1'
-  _inc_extra="$_inc_extra `$_dvdnavconfig --cflags`"
-  _ld_extra="$_ld_extra `$_dvdnavconfig --minilibs`"
+  _inc_extra="$_inc_extra $_dvdnavdir" 
+  _ld_extra="$_ld_extra $_dvdnavlibs" 
   _inputmodules="dvdnav $_inputmodules"
 else
   _def_dvdnav='#undef CONFIG_DVDNAV'