blob: 776e05ae6e7fb004bc6684b9393d09aabcf28693 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
|
--- configure.ac.orig 2018-01-23 23:01:37 UTC
+++ configure.ac
@@ -48,23 +48,24 @@ AM_CONDITIONAL([X11_UNAVAILABLE], [test x$no_x = xyes]
AC_FUNC_ALLOCA
AC_FUNC_MALLOC
+PKG_PROG_PKG_CONFIG
+
# Check for Freetype2 usability.
-AC_CHECK_PROG(HAVE_FREETYPE_CONFIG, freetype-config, yes)
-if test "x$HAVE_FREETYPE_CONFIG" = "xyes"; then
- FREETYPE_INC=`freetype-config --cflags`
+PKG_CHECK_MODULES(FREETYPE, freetype2, [
+ FREETYPE_INC="$FREETYPE_CFLAGS"
CPPFLAGS="$CPPFLAGS $FREETYPE_INC"
AC_CHECK_HEADER(ft2build.h, HAVE_FREETYPE=yes,
HAVE_FREETYPE=no CPPFLAGS=$save_CPPFLAGS)
if test "x$HAVE_FREETYPE" = "xyes" ; then
- FREETYPE_LD_FLAGS=`freetype-config --libs`;
+ FREETYPE_LD_FLAGS="$FREETYPE_LIBS"
LIBS="$LIBS $FREETYPE_LD_FLAGS"
AC_CHECK_LIB(freetype, FT_Init_FreeType, HAVE_FREETYPE=yes,
HAVE_FREETYPE=no)
fi
-fi
+])
if test "x$HAVE_FREETYPE" != "xyes" ; then
- echo "Freetype library wan't found in your system!"
+ echo "Freetype library not found in your system!"
exit 1
fi
AC_SUBST(FREETYPE_INC)
|
