From b5dbc0eb739a3598cd903153f8b30820312848b2 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 4 Jun 2016 22:43:21 +0200 Subject: [PATCH] Disable wxUIActionSimulator in wxGTK3 if --without-xtest was given This class can't work without XTest support with GTK+ 3, so just silently disable it if XTest was explicitly disabled by user. --- configure | 2 ++ configure.in | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/configure b/configure index ee4f2cea75..86bff4a4b5 100755 --- a/configure +++ b/configure @@ -33659,6 +33659,8 @@ $as_echo "yes" >&6; } fi + elif test "$WXGTK3" = 1; then + wxUSE_UIACTIONSIMULATOR=no fi fi diff --git a/configure.in b/configure.in index ffa2ab839e..d543ca98d6 100644 --- a/configure.in +++ b/configure.in @@ -6379,6 +6379,11 @@ if test "$wxUSE_UIACTIONSIMULATOR" = "yes" ; then wxUSE_XTEST="no" ] ) + elif test "$WXGTK3" = 1; then + dnl As per above, wxUIActionSimulator can't be used in this case, + dnl but there is no need to warn, presumably the user knows what + dnl he's doing if --without-xtest was explicitly specified. + wxUSE_UIACTIONSIMULATOR=no fi fi