From 3279e16bbf9ddfc290869a71a46be59921a2950a Mon Sep 17 00:00:00 2001
From: matt335672 <30179339+matt335672@users.noreply.github.com>
Date: Mon, 14 Nov 2022 19:51:05 +0000
Subject: [PATCH] Fix freetype2 version checking

The version of freetype2 returned by pkg-config --modversion is
not the same as the product release version. Consequently, the
check for version >= 2.8.0 does not work.
---
 configure.ac | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 04b64287..96d98943 100644
--- a/configure.ac
+++ b/configure.ac
@@ -281,14 +281,21 @@ if test x$use_imlib2 = xyes; then
 fi
 
 # Find freetype2
+#
+# The modversion used by pkgcheck does not correspond to the
+# freetype2 release. See docs/VERSIONS.TXT in the freetype2
+# source for a table of correspondences. If you change one
+# of the below defines, change both.
+m4_define([FT2_REQUIRED_VERSION], [2_8_0])
+m4_define([FT2_REQUIRED_MODVERSION], [20.0.14])
 case "$with_freetype2" in
     '' | no) AC_MSG_NOTICE([freetype2 will not be supported])
         use_freetype2=no
         ;;
     yes)
-        PKG_CHECK_MODULES([FREETYPE2], [freetype2 >= 2.8],
+        PKG_CHECK_MODULES([FREETYPE2], [freetype2 >= FT2_REQUIRED_MODVERSION],
             [use_freetype2=yes],
-            [AC_MSG_ERROR([please install libfreetype6-dev or freetype-devel])])
+            [AC_MSG_ERROR([please install version FT2_REQUIRED_VERSION or later of libfreetype6-dev or freetype-devel])])
         ;;
     /*) AC_MSG_CHECKING([for freetype2 in $with_freetype2])
         if test -d $with_freetype2/lib; then