Mercurial > mplayer.hg
changeset 36420:b8ccbb9b9dad
Improve handling of internal vs. external dvdread/dvdnav
Document that switching dvdread to external also switches
dvdnav.
If dvdnav-config/dvdread-config paths are given, assume
the user wants to use external versions.
| author | reimar |
|---|---|
| date | Sat, 16 Nov 2013 23:31:56 +0000 |
| parents | c69eaba13338 |
| children | 0d7459fc4354 |
| files | configure |
| diffstat | 1 files changed, 5 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Sat Nov 16 23:27:16 2013 +0000 +++ b/configure Sat Nov 16 23:31:56 2013 +0000 @@ -360,7 +360,7 @@ --disable-bluray disable Blu-ray support [autodetect] --disable-dvdnav disable libdvdnav [autodetect] --disable-dvdread disable libdvdread [autodetect] - --disable-dvdread-internal disable internal libdvdread [autodetect] + --disable-dvdread-internal disable internal libdvdread and libdvdnav [autodetect] --disable-libdvdcss-internal disable internal libdvdcss [autodetect] --disable-cdparanoia disable cdparanoia [autodetect] --disable-cddb disable cddb [autodetect] @@ -602,8 +602,8 @@ --with-glib-config=PATH path to glib*-config --with-gtk-config=PATH path to gtk*-config --with-sdl-config=PATH path to sdl*-config - --with-dvdnav-config=PATH path to dvdnav-config - --with-dvdread-config=PATH path to dvdread-config + --with-dvdnav-config=PATH path to dvdnav-config, also disables internal dvdread and dvdnav + --with-dvdread-config=PATH path to dvdread-config, also disables internal dvdread and dvdnav This configure script is NOT autoconf-based, even though its output is similar. It will try to autodetect all configuration options. If you --enable an option @@ -916,9 +916,11 @@ ;; --with-dvdnav-config=*) _dvdnavconfig=$(option_value $ac_option) + _dvdread_internal=no ;; --with-dvdread-config=*) _dvdreadconfig=$(option_value $ac_option) + _dvdread_internal=no ;; --extra-cflags=*)