summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorUoti Urpala <uau@mplayer2.org>2011-10-25 07:05:47 +0300
committerUoti Urpala <uau@mplayer2.org>2011-10-25 07:05:47 +0300
commit8b5efd6455370c02211f9fec2a3dbb74f5d0fcbc (patch)
tree4a8222fbf5ed2c8e7b7766435820183ff641c97d /configure
parentb200583403219136363b755afab2b05c0937a928 (diff)
downloadmpv-8b5efd6455370c02211f9fec2a3dbb74f5d0fcbc.tar.bz2
mpv-8b5efd6455370c02211f9fec2a3dbb74f5d0fcbc.tar.xz
libmenu: remove OSD menu functionality (--menu)
Something like the OSD menu functionality could be useful. However the current implementation has several problems and would require a relatively large amount of work to get into good shape. As far as I know there are few users of the existing functionality. Nobody is working on the existing code and keeping it compiling at all while changing other code would require extra work. So delete the menu code and some related code elsewhere that's used by nothing else.
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure26
1 files changed, 4 insertions, 22 deletions
diff --git a/configure b/configure
index f79b8cec08..9221501729 100755
--- a/configure
+++ b/configure
@@ -334,7 +334,6 @@ Optional features:
--disable-freetype disable FreeType 2 font rendering [autodetect]
--disable-fontconfig disable fontconfig font lookup [autodetect]
--disable-unrarexec disable using of UnRAR executable [enabled]
- --enable-menu enable OSD menu (not DVD menu) [disabled]
--disable-sortsub disable subtitle sorting [enabled]
--enable-fribidi enable the FriBiDi libs [autodetect]
--disable-enca disable ENCA charset oracle library [autodetect]
@@ -678,7 +677,6 @@ _big_endian=auto
_bitmap_font=yes
_freetype=auto
_fontconfig=auto
-_menu=no
_qtx=auto
_coreaudio=auto
_corevideo=auto
@@ -1110,9 +1108,6 @@ for ac_option do
--enable-dga2) _dga2=yes ;;
--disable-dga2) _dga2=no ;;
- --enable-menu) _menu=yes ;;
- --disable-menu) _menu=no ;;
-
--enable-qtx) _qtx=yes ;;
--disable-qtx) _qtx=no ;;
@@ -6388,17 +6383,6 @@ fi
echores "$_vstream"
-echocheck "OSD menu"
-if test "$_menu" = yes ; then
- def_menu='#define CONFIG_MENU 1'
- test $_dvbin = "yes" && _menu_dvbin=yes
-else
-def_menu='#undef CONFIG_MENU'
- _menu_dvbin=no
-fi
-echores "$_menu"
-
-
echocheck "Subtitles sorting"
if test "$_sortsub" = yes ; then
def_sortsub='#define CONFIG_SORTSUB 1'
@@ -6716,8 +6700,6 @@ LIBDCA = $_libdca
LIBDV = $_libdv
LIBDVDCSS_INTERNAL = $_libdvdcss_internal
LIBMAD = $_mad
-LIBMENU = $_menu
-LIBMENU_DVBIN = $_menu_dvbin
LIBNEMESI = $_nemesi
LIBNUT = $_libnut
LIBSMBCLIENT = $_smb
@@ -6938,7 +6920,6 @@ $def_charset
$def_crash_debug
$def_debug
$def_fastmemcpy
-$def_menu
$def_runtime_cpudetection
$def_sighandler
$def_sortsub
@@ -7245,9 +7226,10 @@ skipping autodetection. This behavior is unlike what you may be used to from
autoconf-based configure scripts that can decide to override you. This greater
level of control comes at a price. You may have to provide the correct compiler
and linker flags yourself.
-If you used one of these options (except --enable-menu and similar ones that
-turn on internal features) and experience a compilation or linking failure,
-make sure you have passed the necessary compiler/linker flags to configure.
+If you used one of these options (except --enable-runtime-cpudetection and
+similar ones that turn on internal features) and experience a compilation or
+linking failure, make sure you have passed the necessary compiler/linker flags
+to configure.
If you suspect a bug, please read DOCS/HTML/$language_doc/bugreports.html.