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

Reduce configure warnings about missing spell checking support

Browse Source 
It's not really useful to warn that spell checking is not available for
the ports for which it's not implemented anyhow, as there is nothing
that the person running configure can do about it anyhow.

Still warn about missing gtkspell library when using GTK 3, however, as
it may be useful to know that it's not available and could be installed
in order to activate spell checking support.
This commit is contained in:
Vadim Zeitlin
2021-08-22 21:53:30 +02:00
parent d9ea30cf84
commit 01d3a96043
2 changed files with 25 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
configure vendored
View File

@@ -33977,11 +33977,7 @@ fi
if test "$wxUSE_SPELLCHECK" = "yes"; then if test "$wxUSE_SPELLCHECK" = "yes"; then
if test "$wxUSE_MSW" = 1 -o test "$wxUSE_OSX_COCOA" = 1; then if test "$WXGTK3" = 1; then
has_spellcheck_support=yes
elif test "$wxUSE_GTK" = 1; then
if test "$WXGTK3" = 1; then
pkg_failed=no pkg_failed=no
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTKSPELL" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GTKSPELL" >&5
@@ -34042,16 +34038,16 @@ fi
echo "$GTKSPELL_PKG_ERRORS" >&5 echo "$GTKSPELL_PKG_ERRORS" >&5
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: gtkspell3-3.0 not found, spellchecking won't be available" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: gtkspell3-3.0 not found, spell checking in wxTextCtrl won't be available" >&5
$as_echo "$as_me: WARNING: gtkspell3-3.0 not found, spellchecking won't be available" >&2;} $as_echo "$as_me: WARNING: gtkspell3-3.0 not found, spell checking in wxTextCtrl won't be available" >&2;}
has_spellcheck_support=no wxUSE_SPELLCHECK=no
elif test $pkg_failed = untried; then elif test $pkg_failed = untried; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: gtkspell3-3.0 not found, spellchecking won't be available" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: gtkspell3-3.0 not found, spell checking in wxTextCtrl won't be available" >&5
$as_echo "$as_me: WARNING: gtkspell3-3.0 not found, spellchecking won't be available" >&2;} $as_echo "$as_me: WARNING: gtkspell3-3.0 not found, spell checking in wxTextCtrl won't be available" >&2;}
has_spellcheck_support=no wxUSE_SPELLCHECK=no
else else
@@ -34060,24 +34056,13 @@ else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
$as_echo "yes" >&6; } $as_echo "yes" >&6; }
CXXFLAGS="$GTKSPELL_CFLAGS $CXXFLAGS" CXXFLAGS="$GTKSPELL_CFLAGS $CXXFLAGS"
LIBS="$GTKSPELL_LIBS $LIBS" LIBS="$GTKSPELL_LIBS $LIBS"
has_spellcheck_support=yes
fi fi
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Spellchecking is not supported on GTK < 3" >&5
$as_echo "$as_me: WARNING: Spellchecking is not supported on GTK < 3" >&2;}
has_spellcheck_support=no
fi
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Spellchecking is not supported on this platform" >&5
$as_echo "$as_me: WARNING: Spellchecking is not supported on this platform" >&2;}
has_spellcheck_support=no
fi fi
if test "$has_spellcheck_support" = "yes"; then if test "$wxUSE_SPELLCHECK" = "yes"; then
$as_echo "#define wxUSE_SPELLCHECK 1" >>confdefs.h $as_echo "#define wxUSE_SPELLCHECK 1" >>confdefs.h
fi fi

44
configure.in
View File

@@ -5768,38 +5768,24 @@ dnl Spellchecking for wxTextCtrl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
if test "$wxUSE_SPELLCHECK" = "yes"; then if test "$wxUSE_SPELLCHECK" = "yes"; then
dnl The required APIs are always available under MSW and OS X but we must dnl The required APIs are always available under MSW and OS X and we don't
dnl have GTK3 and GNOME gtkspell under Unix to be able to compile this feature. dnl implement support for spell checking in the other ports, but for GTK 3
dnl we need to check for gtkspell library.
if test "$wxUSE_MSW" = 1 -o test "$wxUSE_OSX_COCOA" = 1; then if test "$WXGTK3" = 1; then
dnl Always available under these systems PKG_CHECK_MODULES(GTKSPELL, [gtkspell3-3.0],
has_spellcheck_support=yes [
CXXFLAGS="$GTKSPELL_CFLAGS $CXXFLAGS"
elif test "$wxUSE_GTK" = 1; then LIBS="$GTKSPELL_LIBS $LIBS"
if test "$WXGTK3" = 1; then ],
PKG_CHECK_MODULES(GTKSPELL, [gtkspell3-3.0], [
[ AC_MSG_WARN([gtkspell3-3.0 not found, spell checking in wxTextCtrl won't be available])
CXXFLAGS="$GTKSPELL_CFLAGS $CXXFLAGS" wxUSE_SPELLCHECK=no
LIBS="$GTKSPELL_LIBS $LIBS" ]
has_spellcheck_support=yes )
],
[
AC_MSG_WARN([gtkspell3-3.0 not found, spellchecking won't be available])
has_spellcheck_support=no
]
)
else
AC_MSG_WARN([Spellchecking is not supported on GTK < 3])
has_spellcheck_support=no
fi
else
dnl Not implemented in the other ports yet.
AC_MSG_WARN([Spellchecking is not supported on this platform])
has_spellcheck_support=no
fi fi
if test "$has_spellcheck_support" = "yes"; then if test "$wxUSE_SPELLCHECK" = "yes"; then
AC_DEFINE(wxUSE_SPELLCHECK) AC_DEFINE(wxUSE_SPELLCHECK)
fi fi
fi fi