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