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

20
configure vendored
View File

@@ -33569,7 +33569,8 @@ if test "$wxUSE_UIACTIONSIMULATOR" = "yes" ; then
$as_echo "#define wxUSE_UIACTIONSIMULATOR 1" >>confdefs.h
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS uiaction"
if test "$wxUSE_XTEST" = "yes" ; then
if test "$wxUSE_GTK" = 1 -o "$wxUSE_MOTIF" = 1 -o "$wxUSE_X11" = 1; then
if test "$wxUSE_XTEST" = "yes" ; then
pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for XTST" >&5
@@ -33630,16 +33631,16 @@ fi
echo "$XTST_PKG_ERRORS" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: XTest extension not found" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: XTest extension not found" >&5
$as_echo "$as_me: WARNING: XTest extension not found" >&2;}
wxUSE_XTEST="no"
wxUSE_XTEST="no"
elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: XTest extension not found" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: XTest extension not found" >&5
$as_echo "$as_me: WARNING: XTest extension not found" >&2;}
wxUSE_XTEST="no"
wxUSE_XTEST="no"
else
@@ -33648,13 +33649,14 @@ else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; }
GUI_TK_LIBRARY="$GUI_TK_LIBRARY $XTST_LIBS"
CFLAGS="$XTST_CFLAGS $CFLAGS"
CXXFLAGS="$XTST_CFLAGS $CXXFLAGS"
$as_echo "#define wxUSE_XTEST 1" >>confdefs.h
GUI_TK_LIBRARY="$GUI_TK_LIBRARY $XTST_LIBS"
CFLAGS="$XTST_CFLAGS $CFLAGS"
CXXFLAGS="$XTST_CFLAGS $CXXFLAGS"
$as_echo "#define wxUSE_XTEST 1" >>confdefs.h
fi
fi
fi
fi

28
configure.in
View File

@@ -6361,19 +6361,21 @@ fi
if test "$wxUSE_UIACTIONSIMULATOR" = "yes" ; then
AC_DEFINE(wxUSE_UIACTIONSIMULATOR)
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS uiaction"
if test "$wxUSE_XTEST" = "yes" ; then
PKG_CHECK_MODULES(XTST, xtst,
[
GUI_TK_LIBRARY="$GUI_TK_LIBRARY $XTST_LIBS"
CFLAGS="$XTST_CFLAGS $CFLAGS"
CXXFLAGS="$XTST_CFLAGS $CXXFLAGS"
AC_DEFINE(wxUSE_XTEST)
],
[
AC_MSG_WARN([XTest extension not found])
wxUSE_XTEST="no"
]
)
if test "$wxUSE_GTK" = 1 -o "$wxUSE_MOTIF" = 1 -o "$wxUSE_X11" = 1; then
if test "$wxUSE_XTEST" = "yes" ; then
PKG_CHECK_MODULES(XTST, xtst,
[
GUI_TK_LIBRARY="$GUI_TK_LIBRARY $XTST_LIBS"
CFLAGS="$XTST_CFLAGS $CFLAGS"
CXXFLAGS="$XTST_CFLAGS $CXXFLAGS"
AC_DEFINE(wxUSE_XTEST)
],
[
AC_MSG_WARN([XTest extension not found])
wxUSE_XTEST="no"
]
)
fi
fi
fi