1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
|
From 0d5b3bc1cc492c10072def017fe704782bc4b274 Mon Sep 17 00:00:00 2001
From: Lars Wendler <polynomial-c@gentoo.org>
Date: Fri, 4 May 2018 17:40:04 +0200
Subject: [PATCH] Use pkg-config to find freetype
As of freetype-2.9.1 the freetype-config script has been deprecated and
is no longer shipped by default.
---
configure.in | 30 +++++++-----------------------
1 file changed, 7 insertions(+), 23 deletions(-)
diff --git a/configure.in b/configure.in
index 361db86c..cb9423f5 100644
--- a/configure.in
+++ b/configure.in
@@ -257,26 +257,10 @@ freetype_support=yes)
if test "$freetype_support" = "yes"; then
dnl Check for the freetype library
- AC_ARG_WITH(freetype-config, [ --with-freetype-config=PROG Use FreeType configuration program PROG], freetype_config=$withval, freetype_config=yes)
- if test "$freetype_config" = "yes"; then
- AC_PATH_PROG(ft_config,freetype-config,no)
- if test "$ft_config" = "no"; then
- echo "To compile ming please install freetype:"
- echo " as .deb user: sudo apt-get install libfreetype6 libfreetype6-dev"
- echo ""
- echo "or disable the freetype configuration option:"
- echo " --disable-freetype"
- AC_MSG_ERROR([Could not detect freetype-config!])
- fi
- else
- ft_config="$freetype_config"
- fi
-
- FREETYPE_CFLAGS="`$ft_config --cflags`"
- FREETYPE_LIBS="`$ft_config --libs`"
-
- AC_SUBST(FREETYPE_LIBS)
- AC_SUBST(FREETYPE_CFLAGS)
+ PKG_PROG_PKG_CONFIG
+ PKG_CHECK_MODULES(FREETYPE, freetype2, HAS_FREETYPE=true,
+ AC_MSG_ERROR([Could not find freetype])
+ )
fi
dnl Check for the ungif or gif (new or old) libraries
@@ -334,9 +318,9 @@ if test -n "${ZLIB}" -a -n "${ZLIB_INC}"; then
AC_DEFINE([USE_ZLIB], [1], [Use zlib])
fi
-AM_CONDITIONAL(USE_FREETYPE, test x${ft_config} != x)
-if test -n "${ft_config}"; then
- AC_DEFINE(USE_FREETYPE, [1], [Use freetype library])
+AM_CONDITIONAL(USE_FREETYPE, test x${HAS_FREETYPE} != x)
+if test x${HAS_FREETYPE} = xtrue ; then
+ AC_DEFINE(USE_FREETYPE, [1], [Use freetype library])
fi
AM_CONDITIONAL(GIFLIB_GIFERRORSTRING, test x"$ac_cv_lib_gif_GifErrorString" = xyes)
--
2.17.0
|
GitWeb
