comparison configure @ 28256:cd79547b7467

Support an "internal" dvdnav version to make it easier to compile with, test and debug dvdnav SVN.

28255:aeefca2deed3

#this must be the last test to be performed or the ones following it will likely fail
#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
    _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

  cc_check $_dvdnavdir $_dvdnavlibs $_ld_dl $_ld_pthread && _dvdnav=yes
fi
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`"
  _inputmodules="dvdnav $_inputmodules"
else
  _def_dvdnav='#undef CONFIG_DVDNAV'
  _noinputmodules="dvdnav $_noinputmodules"
fi

DIRECT3D = $_direct3d
DIRECTFB = $_directfb
DIRECTX = $_directx
DVBIN = $_dvbin
DVDNAV = $_dvdnav
DVDREAD = $_dvdread
DVDREAD_INTERNAL = $_dvdread_internal
DXR2 = $_dxr2
DXR3 = $_dxr3
ESD = $_esd

28256:cd79547b7467

#this must be the last test to be performed or the ones following it will likely fail
#because libdvdnavmini is intentionally not linked against libdvdread (to permit mplayer
# to use its own copy of the library)
echocheck "DVD support (libdvdnav)"
dvdnav_internal=no
if test "$_dvdnav" = auto ; then
  if test "$_dvdread_internal" = yes ; then
    _dvdnav=yes
    dvdnav_internal=yes
    _res_comment="internal"
  else
    $_dvdnavconfig --version --minilibs >> $TMPLOG 2>&1 || _dvdnav=no
  fi
fi
if test "$_dvdnav" = auto ; then

  cc_check $_dvdnavdir $_dvdnavlibs $_ld_dl $_ld_pthread && _dvdnav=yes
fi
if test "$_dvdnav" = yes ; then
  _largefiles=yes
  _def_dvdnav='#define CONFIG_DVDNAV 1'
  if test "$dvdnav_internal" = yes ; then
    _inc_extra="$_inc_extra -Ilibdvdnav"
  else
  _inc_extra="$_inc_extra `$_dvdnavconfig --cflags`"
  _ld_extra="$_ld_extra `$_dvdnavconfig --minilibs`"
  fi
  _inputmodules="dvdnav $_inputmodules"
else
  _def_dvdnav='#undef CONFIG_DVDNAV'
  _noinputmodules="dvdnav $_noinputmodules"
fi

DIRECT3D = $_direct3d
DIRECTFB = $_directfb
DIRECTX = $_directx
DVBIN = $_dvbin
DVDNAV = $_dvdnav
DVDNAV_INTERNAL = $dvdnav_internal
DVDREAD = $_dvdread
DVDREAD_INTERNAL = $_dvdread_internal
DXR2 = $_dxr2
DXR3 = $_dxr3
ESD = $_esd