[pan: 7/16] Always use enchant2

[Dominique Dumont <ddumont src gnome org>]

commit 157b8f49b88b8ad1e33f209a9272465253c3dbd7
Author: Thomas Tanner <thosrtanner googlemail com>
Date:   Sun Apr 10 16:44:34 2022 +0100

    Always use enchant2

 configure.ac                  | 5 ++---
 pan/gui/group-prefs-dialog.cc | 4 ----
 2 files changed, 2 insertions(+), 7 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 7550a41..db4810f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -55,7 +55,6 @@ GTK_REQUIRED=2.16.0
 GTK3_REQUIRED=3.0.0
 GTKSPELL_REQUIRED=2.0.7
 GTKSPELL3_REQUIRED=2.0.16
-ENCHANT_REQUIRED=1.6.0
 ENCHANT2_REQUIRED=2.2.3
 GNUTLS_REQUIRED=3.0.0
 LIBNOTIFY_REQUIRED=0.4.1
@@ -144,8 +143,8 @@ 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],
-                      [GTKSPELL_VER=`pkg-config --modversion gtkspell-2.0 enchant | xargs`
+   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)"
                       AC_DEFINE(HAVE_GTKSPELL,[1],[GtkSpell support for spellchecking])
                       AC_DEFINE(GTKSPELL_VERSION,[2],[GtkSpell API version])],
diff --git a/pan/gui/group-prefs-dialog.cc b/pan/gui/group-prefs-dialog.cc
index 5b9296a..8ed7a0a 100644
--- a/pan/gui/group-prefs-dialog.cc
+++ b/pan/gui/group-prefs-dialog.cc
@@ -22,11 +22,7 @@
 #include <glib.h>
 #include "gtk-compat.h"
 #ifdef HAVE_GTKSPELL
-#if GTKSPELL_VERSION == 3
 #include <enchant-2/enchant.h>
-#else
-#include <enchant/enchant.h>
-#endif
 #endif
 #include <pan/general/debug.h>
 #include <pan/general/macros.h>