[pan] Enable make distcheck for both GTK builds

[Petr Kovář <pmkovar src gnome org>]

commit ba7a42ba35bc1692fc5d39c1a83ec97f80b1ee1e
Author: Petr Kovar <pkovar redhat com>
Date:   Wed Jan 12 15:33:08 2022 +0100

    Enable make distcheck for both GTK builds

 .gitlab-ci.yml |  3 +--
 README.org     | 20 ++++++++++----------
 configure.ac   | 14 +++++++-------
 3 files changed, 18 insertions(+), 19 deletions(-)
---
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 07251c3..d7f3b7d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,12 +25,11 @@ build-ubuntu-gtk2:
         libgnutls28-dev
         yelp-tools
   script:
-    - head -15 configure.ac
     - mkdir _build
     - cd _build
     - ../autogen.sh --with-gtk2 --with-gnutls --with-dbus --with-gmime-crypto --without-gtkspell 
--enable-libnotify --enable-gkr --enable-manual
     - make
-    - make dist
+    - DISTCHECK_CONFIGURE_FLAGS=--with-gtk2 make distcheck
 
 build-ubuntu-gtk3:
   image: ubuntu:rolling
diff --git a/README.org b/README.org
index 87badc3..9dfcbde 100644
--- a/README.org
+++ b/README.org
@@ -1,6 +1,6 @@
 * Pan - A GNOME Newsreader
 
-This is Pan, a powerful and user-friendly Usenet newsreader for GTK+.
+This is Pan, a powerful and user-friendly Usenet newsreader for GTK.
 The latest information and versions of Pan can always be found at
 [[http://pan.rebelbase.com/][Pan website]].
 
@@ -72,18 +72,18 @@ Pan requires these libraries:
 
 - [[http://developer.gnome.org/glib/][GLib]] 2.17.6 or higher
   (optionally GLib 2.26.0 or higher to support multiple Pan instances)
-- [[http://www.gtk.org/][GTK+]] 3.0.0 or higher (GTk2 support is deprecated)
+- [[http://www.gtk.org/][GTK]] 3.0.0 or higher (GTK 2 support is deprecated)
 - [[http://spruce.sourceforge.net/gmime/][GMime]] 3.0.0 or higher (optionally with PGP cryptography support)
 
 The following libraries add extra features but are optional:
 
-- [[http://gtkspell.sourceforge.net][GtkSpell]] 2.0.7 or higher for spellchecker support
-  (GtkSpell 2.0.16 or higher when using GTK+ 3)
-- [[http://www.abisource.com/projects/enchant/][Enchant]] 1.6.0 or higher for spellchecker support
+- [[http://gtkspell.sourceforge.net][GtkSpell 3]] 2.0.16 or higher for spellchecker support
+  (GtkSpell 2.0.7 or higher when using GTK 2)
+- [[http://www.abisource.com/projects/enchant/][Enchant]] 2.2.3 or higher for spellchecker support
+  (Enchant 1.6.0 or higher when using GTK 2)
 - [[http://www.galago-project.org/news/index.php][libnotify]] 0.4.1 or higher for notifications
-- [[https://wiki.gnome.org/Projects/GnomeKeyring][GNOME Keyring]] 3.2.0 or higher for password storage
 - [[https://developer.gnome.org/libsecret/][libsecret]] 0.16 or higher and 
[[https://developer.gnome.org/gcr/][gcr]] 3.20 or higher for password storage
-  when using GTK+ 3 
+  ([[https://wiki.gnome.org/Projects/GnomeKeyring][GNOME Keyring]] 3.2.0 or higher when using GTK 2)
 - [[http://www.freedesktop.org/wiki/Software/dbus][D-Bus]] to support running multiple Pan instances
 - [[http://www.gnu.org/software/gnutls/][GnuTLS]] 3.0.0 or higher for encrypted connections (TLS 1.x)
 - [[https://wiki.gnome.org/Apps/Yelp/Tools][Yelp Tools]] for built-in user manual
@@ -91,13 +91,13 @@ The following libraries add extra features but are optional:
 The following libraries are experimental and not suitable for any use
 other than testing. Use at your own risk:
 
-- [[https://webkitgtk.org/][WebKitGTK+]] 1.8.1 or higher for embedded HTML
+- [[https://webkitgtk.org/][WebKitGTK]] 1.8.1 or higher for embedded HTML
 
 The following librairies are deprecated and will be removed in future
 releases:
 
 - [[https://gitlab.gnome.org/GNOME/gmime][GMime]] 2.6.20 or higher (optionally with PGP cryptography support)
-- Gtk2
+- GTK 2 2.16.0 or higher
 
 Run the following command to get a list of all options that you can
 enable or disable at configure (or autogen) time:
@@ -152,6 +152,6 @@ channel =#pan=.
 * LINKS
 
 - [[http://pan.rebelbase.com/][Pan]]
-- [[http://www.gtk.org/][GTK+]]
+- [[http://www.gtk.org/][GTK]]
 - [[http://www.gnome.org/][GNOME]]
 - [[http://www.gnu.org/][GNU]]
diff --git a/configure.ac b/configure.ac
index 78ac988..4e21165 100644
--- a/configure.ac
+++ b/configure.ac
@@ -148,7 +148,7 @@ gtkspell_msg=no
 AC_ARG_WITH([gtkspell],
   AS_HELP_STRING([--with-gtkspell],[enable GtkSpell support (normally: yes)]), [want_gtkspell=$withval], 
[want_gtkspell=yes])
 
-dnl GTK+ 3, GtkSpell 3, and Enchant support
+dnl GTK 3, GtkSpell 3, and Enchant support
 gtk_msg=no
 AC_ARG_WITH([gtk2],
   AS_HELP_STRING([--with-gtk2],[enable GTK 2 support (deprecated, normally: no)]), [want_gtk2=$withval], 
[want_gtk2=no])
@@ -167,7 +167,7 @@ else
   PKG_CHECK_MODULES([GTK], [gtk+-3.0 >= $GTK3_REQUIRED],
                     [GTK_VER=`pkg-config --modversion gtk+-3.0`
                     gtk_msg="yes ($GTK_VER)"
-                    AC_DEFINE(HAVE_GTK,[1],[GTK+ 3 support])]
+                    AC_DEFINE(HAVE_GTK,[1],[GTK 3 support])]
                     )
   if test "x$want_gtkspell" = "xyes" ; then
     PKG_CHECK_MODULES([GTKSPELL], [gtkspell3-3.0 >= $GTKSPELL3_REQUIRED enchant-2 >= $ENCHANT2_REQUIRED],
@@ -183,9 +183,9 @@ fi
 AC_SUBST(ENCHANT_CFLAGS)
 AC_SUBST(ENCHANT_LIBS)
 
-dnl WebKitGTK+ support
+dnl WebKitGTK support
 AC_ARG_WITH([webkit],
-  AS_HELP_STRING([--with-webkit],[enable WebKitGTK+ support (experimental, normally: no)]), 
[want_webkit=$withval], [want_webkit=no])
+  AS_HELP_STRING([--with-webkit],[enable WebKitGTK support (experimental, normally: no)]), 
[want_webkit=$withval], [want_webkit=no])
 if test "x$want_gtk2" = "xyes" ; then
   if test "x$want_webkit" = "xyes" ; then
     PKG_CHECK_MODULES([WEBKITGTK], [webkitgtk-1.0 >= $WEBKIT_REQUIRED],
@@ -237,7 +237,7 @@ if test "x$enable_libnotify" = "xyes" ; then
   AC_SUBST([LIBNOTIFY_LIBS])
 fi
 
-dnl Check for libsecret and gcr (GTK+ 3 only) or GNOME Keyring if user-enabled for password storage
+dnl Check for libsecret and gcr (GTK 3 only) or GNOME Keyring if user-enabled for password storage
 AC_ARG_ENABLE([gkr],
   AS_HELP_STRING([--enable-gkr],[enable GNOME Keyring or libsecret support (normally: 
no)]),[enable_gkr=$enableval],[enable_gkr=no])
 if test "x$enable_gkr" = "xyes" ; then
@@ -359,8 +359,8 @@ Configuration:
         With GMime 2:           ${want_gmime2}
         With GMime crypto:      ${want_gmime_crypto}
         With GtkSpell:          ${gtkspell_msg}
-        With GTK+ 3:            ${gtk_msg}
-        With WebKitGTK+:        ${want_webkit}
+        With GTK 3:             ${gtk_msg}
+        With WebKitGTK:         ${want_webkit}
         With GnuTLS:            ${gnutls_msg}
         With libnotify:         ${libnotify_msg}
         With password storage:  ${gkr_msg}