[pan: 9/16] Merge branch 'master' of https://gitlab.gnome.org/GNOME/pan into tt-build-windows

[Dominique Dumont <ddumont src gnome org>]

commit fd0f266c260350ea69902b03f5d983c3cb0d8332
Merge: 4885e29 068b9e6
Author: Thomas Tanner <thosrtanner googlemail com>
Date:   Sun Apr 10 20:21:58 2022 +0100

    Merge branch 'master' of https://gitlab.gnome.org/GNOME/pan into tt-build-windows
    
    # Conflicts:
    #       configure.ac

 .gitlab-ci.yml       |    2 +-
 configure.ac         |   29 +-
 pan/gui/body-pane.cc |    2 +-
 po/da.po             | 1855 +++++++++++++++++++++++-----------------------
 po/eu.po             | 1987 +++++++++++++++++++++++++-------------------------
 5 files changed, 1964 insertions(+), 1911 deletions(-)
---
diff --cc configure.ac
index db4810f,71cbcc8..9bc17e0
--- a/configure.ac
+++ b/configure.ac
@@@ -143,15 -144,18 +143,18 @@@ AC_ARG_WITH([gtk2]
    AS_HELP_STRING([--with-gtk2],[enable GTK 2 support (deprecated, normally: no)]), [want_gtk2=$withval], 
[want_gtk2=no])
  if test "x$want_gtk2" = "xyes" ; then
     if test "x$want_gtkspell" = "xyes" ; then
 -   PKG_CHECK_MODULES([GTKSPELL],[gtkspell-2.0 >= $GTKSPELL_REQUIRED enchant >= $ENCHANT_REQUIRED],
 +   PKG_CHECK_MODULES([GTKSPELL],[gtkspell-2.0 >= $GTKSPELL_REQUIRED enchant-2 >= $ENCHANT2_REQUIRED],
-                       [GTKSPELL_VER=`pkg-config --modversion gtkspell-2.0 enchant-2 | xargs`
-                       gtkspell_msg="yes ($GTKSPELL_VER)"
+                       [GTKSPELL_VER=`pkg-config --modversion gtkspell-2.0`
+                       ENCHANT_VER=`pkg-config --modversion enchant`
 -                      gtkspell_msg="yes (gtkspell: $GTKSPELL_VER, enchant: $ENCHANT_VER)"
++                      gtkspell_msg="yes (gtkspell: $GTKSPELL_VER, enchant: $ENCHANT2_VER)"
                        AC_DEFINE(HAVE_GTKSPELL,[1],[GtkSpell support for spellchecking])
-                       AC_DEFINE(GTKSPELL_VERSION,[2],[GtkSpell API version])],
-                       [gtkspell_msg=no
-                       AC_MSG_RESULT(no)])
+                       AC_DEFINE(GTKSPELL_VERSION,[2],[GtkSpell API version])]
+                       )
     fi
-    PKG_CHECK_MODULES([GTK], [gtk+-2.0 >= $GTK_REQUIRED, gthread-2.0])
+    PKG_CHECK_MODULES([GTK], [gtk+-2.0 >= $GTK_REQUIRED, gthread-2.0],
+                             [ GTK_VER=`pkg-config --modversion gtk+-2.0`
+                             gtk_msg="yes, GTK2 ($GTK_VER)" ]
+                             )
  else
    PKG_CHECK_MODULES([GTK], [gtk+-3.0 >= $GTK3_REQUIRED],
                      [GTK_VER=`pkg-config --modversion gtk+-3.0`