From 055400c94e55d93025f64bc79c613c444261406b Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 21 Jan 2009 17:26:25 +0000 Subject: [PATCH] disable wxUSE_MEDIACTRL when wxUSE_ALL_FEATURES==no (closes #10415) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58275 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- configure | 6 +++++- configure.in | 8 ++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/configure b/configure index ecd5c516f8..c0fba3772b 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Id: configure.in 58069 2009-01-13 12:01:30Z FM . +# From configure.in Id: configure.in 58155 2009-01-16 19:03:26Z VZ . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0. # @@ -3215,6 +3215,10 @@ fi echo "${ECHO_T}$result" >&6; } +if test "$wxUSE_ALL_FEATURES" = "no"; then + DEFAULT_wxUSE_MEDIACTRL=no +fi + if test "$wxUSE_GUI" = "yes"; then diff --git a/configure.in b/configure.in index a2dc1ce071..d69f568ab5 100644 --- a/configure.in +++ b/configure.in @@ -430,6 +430,14 @@ fi WX_ARG_DISABLE(all-features,[ --disable-all-features disable all optional features to build minimal library], wxUSE_ALL_FEATURES) +if test "$wxUSE_ALL_FEATURES" = "no"; then + dnl this is a bit ugly but currently we have no choice but to manually + dnl reset all the options with default value of auto if all features are to + dnl be disabled because we can't have an option with default value of + dnl "auto-or-no-if-wxUSE_ALL_FEATURES-is-disabled" + DEFAULT_wxUSE_MEDIACTRL=no +fi + dnl --------------------------------------------------------------------------- dnl port selection dnl --------------------------------------------------------------------------- -- 2.47.2