Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't test for XTest when not using X11 wxUIActionSimulator

Browse Source 
There is no need to check (and give a warning about it being not found) when
building wxMSW, wxOSX or even wxQt.
This commit is contained in:
Vadim Zeitlin
2016-05-21 18:37:35 +02:00
parent a4716916b7
commit ec4a41f3b7
2 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@@ -33569,6 +33569,7 @@ if test "$wxUSE_UIACTIONSIMULATOR" = "yes" ; then
$as_echo "#define wxUSE_UIACTIONSIMULATOR 1" >>confdefs.h $as_echo "#define wxUSE_UIACTIONSIMULATOR 1" >>confdefs.h
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS uiaction" SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS uiaction"
if test "$wxUSE_GTK" = 1 -o "$wxUSE_MOTIF" = 1 -o "$wxUSE_X11" = 1; then
if test "$wxUSE_XTEST" = "yes" ; then if test "$wxUSE_XTEST" = "yes" ; then
pkg_failed=no pkg_failed=no
@@ -33657,6 +33658,7 @@ $as_echo "yes" >&6; }
fi fi
fi fi
fi fi
fi
if test "$wxUSE_DC_TRANSFORM_MATRIX" = "yes" ; then if test "$wxUSE_DC_TRANSFORM_MATRIX" = "yes" ; then
$as_echo "#define wxUSE_DC_TRANSFORM_MATRIX 1" >>confdefs.h $as_echo "#define wxUSE_DC_TRANSFORM_MATRIX 1" >>confdefs.h

2
configure.in
View File

@@ -6361,6 +6361,7 @@ fi
if test "$wxUSE_UIACTIONSIMULATOR" = "yes" ; then if test "$wxUSE_UIACTIONSIMULATOR" = "yes" ; then
AC_DEFINE(wxUSE_UIACTIONSIMULATOR) AC_DEFINE(wxUSE_UIACTIONSIMULATOR)
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS uiaction" SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS uiaction"
if test "$wxUSE_GTK" = 1 -o "$wxUSE_MOTIF" = 1 -o "$wxUSE_X11" = 1; then
if test "$wxUSE_XTEST" = "yes" ; then if test "$wxUSE_XTEST" = "yes" ; then
PKG_CHECK_MODULES(XTST, xtst, PKG_CHECK_MODULES(XTST, xtst,
[ [
@@ -6376,6 +6377,7 @@ if test "$wxUSE_UIACTIONSIMULATOR" = "yes" ; then
) )
fi fi
fi fi
fi
if test "$wxUSE_DC_TRANSFORM_MATRIX" = "yes" ; then if test "$wxUSE_DC_TRANSFORM_MATRIX" = "yes" ; then
AC_DEFINE(wxUSE_DC_TRANSFORM_MATRIX) AC_DEFINE(wxUSE_DC_TRANSFORM_MATRIX)