From e27a451893ce6f772feb284fbb0d740fe23c003e Mon Sep 17 00:00:00 2001
From: Wu Xiaotian <yetist@gmail.com>
Date: Sun, 17 Feb 2019 21:46:00 +0800
Subject: show enchant version when configure

---
 configure.ac | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 822e7a1b..5dc511a8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -98,7 +98,7 @@ dnl ================================================================
 dnl spell plugins checks: enchant and iso-codes
 dnl ================================================================
 
-ENCHANT_REQUIRED=1.2.0
+ENCHANT_REQUIRED=1.6.0
 ISO_CODES_REQUIRED=0.35
 
 AC_ARG_ENABLE([spell],
@@ -107,15 +107,19 @@ AC_ARG_ENABLE([spell],
 	[enable_enchant=yes])
 
 if test "x$enable_enchant" = "xyes" ; then
+        ENCHANT_MODNAME=enchant
+        PKG_CHECK_EXISTS([enchant-2 >= $ENCHANT_REQUIRED], [have_enchant_2=yes], [have_enchant_2=no])
+        if test "x$have_enchant_2" = "xyes"; then
+                ENCHANT_MODNAME=enchant-2
+        fi
 
-	PKG_CHECK_MODULES(ENCHANT, enchant-2 >= $ENCHANT_REQUIRED, \
-			  have_enchant_2=yes, have_enchant_2=no)
+        AC_MSG_CHECKING([the version of enchant])
+        ENCHANT_VERSION=`pkg-config --modversion $ENCHANT_MODNAME`
+        AC_MSG_RESULT([$ENCHANT_VERSION])
 
-	if test "x$have_enchant_2" = "xno"; then
-                PKG_CHECK_MODULES(ENCHANT, enchant >= $ENCHANT_REQUIRED, \
-                                  have_enchant=yes, have_enchant=no)
-        fi
-	if test "x$have_enchant_2" = "xyes" || test "x$have_enchant" = "xyes"; then
+        PKG_CHECK_MODULES(ENCHANT, [$ENCHANT_MODNAME >= $ENCHANT_REQUIRED], \
+                          have_enchant=yes, have_enchant=no)
+	if test "x$have_enchant" = "xyes"; then
 
 		PKG_CHECK_EXISTS([iso-codes >= $ISO_CODES_REQUIRED],
 				 [have_iso_codes=yes],[have_iso_codes=no])
-- 
cgit v1.2.1