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---
11Upstream-Status: Pending
12
13 configure.in | 38 +++++---------------------------------
14 1 file changed, 5 insertions(+), 33 deletions(-)
15
16diff --git a/configure.in b/configure.in
17index 865075e..d7a5a81 100644
18--- a/configure.in
19+++ b/configure.in
20@@ -90,39 +90,11 @@ case "$host" in
21 esac
22 AM_CONDITIONAL(USE_VERSION_RC, test x$use_version_rc = xtrue)
23
24-dnl Check for the FreeType 2 library
25-dnl
26-dnl Get the cflags and libraries from the freetype-config script
27-dnl
28-AC_ARG_WITH(freetype-prefix,[  --with-freetype-prefix=PFX   Prefix where FREETYPE is
29-installed (optional)],
30-            freetype_prefix="$withval", freetype_prefix="")
31-AC_ARG_WITH(freetype-exec-prefix,[  --with-freetype-exec-prefix=PFX Exec prefix
32-where FREETYPE is installed (optional)],
33-            freetype_exec_prefix="$withval", freetype_exec_prefix="")
34-
35-if test x$freetype_exec_prefix != x ; then
36-     freetype_args="$freetype_args --exec-prefix=$freetype_exec_prefix"
37-     if test x${FREETYPE_CONFIG+set} != xset ; then
38-        FREETYPE_CONFIG=$freetype_exec_prefix/bin/freetype-config
39-     fi
40-fi
41-if test x$freetype_prefix != x ; then
42-     freetype_args="$freetype_args --prefix=$freetype_prefix"
43-     if test x${FREETYPE_CONFIG+set} != xset ; then
44-        FREETYPE_CONFIG=$freetype_prefix/bin/freetype-config
45-     fi
46-fi
47-AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no)
48-no_freetype=""
49-if test "$FREETYPE_CONFIG" = "no" ; then
50-    AC_MSG_ERROR([
51-*** Unable to find FreeType2 library (http://www.freetype.org/)
52-])
53-else
54-    CFLAGS="$CFLAGS `$FREETYPE_CONFIG $freetypeconf_args --cflags`"
55-    LIBS="$LIBS `$FREETYPE_CONFIG $freetypeconf_args --libs`"
56-fi
57+PKG_CHECK_MODULES(FREETYPE2, freetype2,
58+    CFLAGS="$CFLAGS $FREETYPE2_CFLAGS"
59+    LIBS="$LIBS $FREETYPE2_LIBS",
60+    AC_MSG_ERROR([*** Unable to find FreeType2 library (http://www.freetype.org/)])
61+)
62
63 dnl Check for SDL
64 SDL_VERSION=1.2.4
65