| Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame^] | 1 | From ed31fd89f4c77d89390774d29427898a85b25ab1 Mon Sep 17 00:00:00 2001 |
| 2 | From: Koen Kooi <koen@dominion.thruhere.net> |
| 3 | Date: Fri, 1 Aug 2014 13:58:36 +0200 |
| 4 | Subject: [PATCH] configure: use pkgconfig for freetype |
| 5 | |
| 6 | Upstream-status: Pending |
| 7 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> |
| 8 | --- |
| 9 | configure.in | 12 +++++------- |
| 10 | 1 file changed, 5 insertions(+), 7 deletions(-) |
| 11 | |
| 12 | diff --git a/configure.in b/configure.in |
| 13 | index 729278d..e569429 100644 |
| 14 | --- a/configure.in |
| 15 | +++ b/configure.in |
| 16 | @@ -164,13 +164,11 @@ dnl Checking for freetype2 |
| 17 | dnl ================================= |
| 18 | FREETYPE_LIBS= |
| 19 | FREETYPE_CFLAGS= |
| 20 | -AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no) |
| 21 | -if test "x$FREETYPE_CONFIG" = "xno" ; then |
| 22 | - AC_MSG_ERROR(You need FreeType2 (freetype-devel v 2.x package) for this version of libgnomeprint) |
| 23 | -else |
| 24 | - FREETYPE_CFLAGS=`$FREETYPE_CONFIG --cflags` |
| 25 | - FREETYPE_LIBS=`$FREETYPE_CONFIG --libs` |
| 26 | -fi |
| 27 | +PKG_CHECK_MODULES(FREETYPE2, freetype2, |
| 28 | + FREETYPE_CFLAGS="$CFLAGS $FREETYPE2_CFLAGS" |
| 29 | + FREETYPE_LIBS="$LIBS $FREETYPE2_LIBS", |
| 30 | + AC_MSG_ERROR([*** Unable to find FreeType2 library (http://www.freetype.org/)]) |
| 31 | +) |
| 32 | |
| 33 | libgnomeprint_save_ldflags=$LDFLAGS |
| 34 | LDFLAGS="$LDFLAGS $FREETYPE_LIBS" |
| 35 | -- |
| 36 | 1.9.0 |
| 37 | |