1From 8cf318197eea91bec6057308befbb29426d69014 Mon Sep 17 00:00:00 2001
2From: Richard Purdie <richard.purdie@linuxfoundation.org>
3Date: Thu, 22 May 2014 10:59:33 +0100
4Subject: [PATCH] freetype-config was removed from oe-core in
5
6commit 5870bd272b0b077d0826fb900b251884c1c05061
7
8    binconfig-disabled: Add class and use
9
10---
11 configure.in | 38 +++++---------------------------------
12 1 file changed, 5 insertions(+), 33 deletions(-)
13
14diff --git a/configure.in b/configure.in
15index 865075e..d7a5a81 100644
16--- a/configure.in
17+++ b/configure.in
18@@ -90,39 +90,11 @@ case "$host" in
19 esac
20 AM_CONDITIONAL(USE_VERSION_RC, test x$use_version_rc = xtrue)
21
22-dnl Check for the FreeType 2 library
23-dnl
24-dnl Get the cflags and libraries from the freetype-config script
25-dnl
26-AC_ARG_WITH(freetype-prefix,[  --with-freetype-prefix=PFX   Prefix where FREETYPE is
27-installed (optional)],
28-            freetype_prefix="$withval", freetype_prefix="")
29-AC_ARG_WITH(freetype-exec-prefix,[  --with-freetype-exec-prefix=PFX Exec prefix
30-where FREETYPE is installed (optional)],
31-            freetype_exec_prefix="$withval", freetype_exec_prefix="")
32-
33-if test x$freetype_exec_prefix != x ; then
34-     freetype_args="$freetype_args --exec-prefix=$freetype_exec_prefix"
35-     if test x${FREETYPE_CONFIG+set} != xset ; then
36-        FREETYPE_CONFIG=$freetype_exec_prefix/bin/freetype-config
37-     fi
38-fi
39-if test x$freetype_prefix != x ; then
40-     freetype_args="$freetype_args --prefix=$freetype_prefix"
41-     if test x${FREETYPE_CONFIG+set} != xset ; then
42-        FREETYPE_CONFIG=$freetype_prefix/bin/freetype-config
43-     fi
44-fi
45-AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no)
46-no_freetype=""
47-if test "$FREETYPE_CONFIG" = "no" ; then
48-    AC_MSG_ERROR([
49-*** Unable to find FreeType2 library (http://www.freetype.org/)
50-])
51-else
52-    CFLAGS="$CFLAGS `$FREETYPE_CONFIG $freetypeconf_args --cflags`"
53-    LIBS="$LIBS `$FREETYPE_CONFIG $freetypeconf_args --libs`"
54-fi
55+PKG_CHECK_MODULES(FREETYPE2, freetype2,
56+    CFLAGS="$CFLAGS $FREETYPE2_CFLAGS"
57+    LIBS="$LIBS $FREETYPE2_LIBS",
58+    AC_MSG_ERROR([*** Unable to find FreeType2 library (http://www.freetype.org/)])
59+)
60
61 dnl Check for SDL
62 SDL_VERSION=1.2.4
63