| Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame] | 1 | From f5c283b1251ad005da7342e654cd2ec5ae9e5fb2 Mon Sep 17 00:00:00 2001 |
| 2 | From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> |
| 3 | Date: Fri, 26 Sep 2014 13:44:36 +0200 |
| 4 | Subject: [PATCH] configure: use pkg-config for freetype2 |
| 5 | MIME-Version: 1.0 |
| 6 | Content-Type: text/plain; charset=UTF-8 |
| 7 | Content-Transfer-Encoding: 8bit |
| 8 | |
| 9 | Upstream-status: Pending |
| 10 | |
| 11 | Signed-off-by: Andreas MΓΌller <schnitzeltony@googlemail.com> |
| 12 | --- |
| 13 | acinclude.m4 | 16 +--------------- |
| 14 | 1 file changed, 1 insertion(+), 15 deletions(-) |
| 15 | |
| 16 | diff --git a/acinclude.m4 b/acinclude.m4 |
| 17 | index 66e79d1..4c70b00 100644 |
| 18 | --- a/acinclude.m4 |
| 19 | +++ b/acinclude.m4 |
| 20 | @@ -52,21 +52,7 @@ if test x"$ac_tumbler_font_thumbnailer" = x"yes"; then |
| 21 | PKG_CHECK_MODULES([GDK_PIXBUF], [gdk-pixbuf-2.0 >= 2.14], |
| 22 | [ |
| 23 | dnl Check for FreeType 2.x |
| 24 | - FREETYPE_LIBS="" |
| 25 | - FREETYPE_CFLAGS="" |
| 26 | - AC_PATH_PROG([FREETYPE_CONFIG], [freetype-config], [no]) |
| 27 | - if test x"$FREETYPE_CONFIG" != x"no"; then |
| 28 | - AC_MSG_CHECKING([FREETYPE_CFLAGS]) |
| 29 | - FREETYPE_CFLAGS="`$FREETYPE_CONFIG --cflags`" |
| 30 | - AC_MSG_RESULT([$FREETYPE_CFLAGS]) |
| 31 | - |
| 32 | - AC_MSG_CHECKING([FREETYPE_LIBS]) |
| 33 | - FREETYPE_LIBS="`$FREETYPE_CONFIG --libs`" |
| 34 | - AC_MSG_RESULT([$FREETYPE_LIBS]) |
| 35 | - else |
| 36 | - dnl We can only build the font thumbnailer if FreeType 2.x is available |
| 37 | - ac_tumbler_font_thumbnailer=no |
| 38 | - fi |
| 39 | + PKG_CHECK_MODULES(FREETYPE, freetype2, , [ac_tumbler_font_thumbnailer=no]) |
| 40 | AC_SUBST([FREETYPE_CFLAGS]) |
| 41 | AC_SUBST([FREETYPE_LIBS]) |
| 42 | ], [ac_tumbler_font_thumbnailer=no]) |
| 43 | -- |
| 44 | 1.8.3.1 |
| 45 | |