diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-01-10 13:51:02 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2009-01-10 13:51:02 +0000 |
| commit | 1ee1a271f8fd49398a182f483cf5e6811704dbc7 (patch) | |
| tree | 05f390518cf54016763aee82ff03b3f11ac6ce77 /configure | |
| parent | 07fb95d10b00e2cc515b9c6cb9dfcfa42f3b4f4a (diff) | |
| download | mpv-1ee1a271f8fd49398a182f483cf5e6811704dbc7.tar.bz2 mpv-1ee1a271f8fd49398a182f483cf5e6811704dbc7.tar.xz | |
Support an "internal" dvdnav version to make it easier to compile with,
test and debug dvdnav SVN.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28291 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 11 |
1 files changed, 9 insertions, 2 deletions
@@ -7775,10 +7775,12 @@ fi #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=no - _res_comment="Disabled in favor of the internal copy of dvdread. Append --disable-dvdread-internal." + _dvdnav=yes + dvdnav_internal=yes + _res_comment="internal" else $_dvdnavconfig --version --minilibs >> $TMPLOG 2>&1 || _dvdnav=no fi @@ -7797,8 +7799,12 @@ 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' @@ -7975,6 +7981,7 @@ DIRECTFB = $_directfb DIRECTX = $_directx DVBIN = $_dvbin DVDNAV = $_dvdnav +DVDNAV_INTERNAL = $dvdnav_internal DVDREAD = $_dvdread DVDREAD_INTERNAL = $_dvdread_internal DXR2 = $_dxr2 |