1 From 259f892fe61f16c26733506d2511eec7ff136dc4 Mon Sep 17 00:00:00 2001
2 From: Lars Wendler <polynomial-c@gentoo.org>
3 Date: Mon, 7 May 2018 09:18:48 +0200
4 Subject: [PATCH] Use pkg-config to find freetype
5
6 As of freetype-2.9.1 the freetype-config file no longer gets installed
7 by default.
8 ---
9 configure.ac | 10 ++++------
10 1 file changed, 4 insertions(+), 6 deletions(-)
11
12 diff --git a/configure.ac b/configure.ac
13 index c06ac6b..1194059 100644
14 --- a/configure.ac
15 +++ b/configure.ac
16 @@ -79,10 +79,8 @@ PKG_CHECK_MODULES([FRIBIDI], [fribidi], [AC_DEFINE(HAVE_FRIBIDI, 1, [whether Fri
17 AC_SUBST(FRIBIDI_CFLAGS)
18 AC_SUBST(FRIBIDI_LIBS)
19
20 -AC_CHECK_PROGS(FREETYPECONFIG, [freetype-config])
21 -if test -n "$FREETYPECONFIG"; then
22 - FREETYPE_CPPFLAGS="`$FREETYPECONFIG --cflags`"
23 - FREETYPE_LIBS="`$FREETYPECONFIG --libs $config_static`"
24 +PKG_CHECK_MODULES(FREETYPE, [freetype2],[
25 + FREETYPE_CPPFLAGS="$FREETYPE_CFLAGS"
26 AC_DEFINE(HAVE_FREETYPE, 1, [Whether FreeType is available])
27
28 ac_save_CPPFLAGS="$CPPFLAGS"
29 @@ -91,9 +89,9 @@ if test -n "$FREETYPECONFIG"; then
30 CPPFLAGS="$ac_save_CPPFLAGS"
31 AC_SUBST(FREETYPE_CPPFLAGS)
32 AC_SUBST(FREETYPE_LIBS)
33 -else
34 + ],
35 AC_MSG_ERROR([freetype not found])
36 -fi
37 +)
38
39
40 AC_ARG_ENABLE([default-video-format],
41 --
42 2.17.0
|
