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
34
35
36
37
38
39
40
41
42
43
44
45
46
47
|
Description: Use pkg-config to detect FreeType 2
Use pkg-config to detect FreeType 2, as freetype-config is not installed
in FreeType 2.9.1 or later.
Author: Hugh McMaster <hugh.mcmaster@outlook.com>
Bug-Debian: https://bugs.debian.org/892438
Last-Update: 2018-11-03
--- xplanet-1.3.0.orig/acinclude.m4
+++ xplanet-1.3.0/acinclude.m4
@@ -46,23 +46,19 @@ if test "$with_cspice" != 'no'; then
fi
])
+PKG_PROG_PKG_CONFIG([0.29])
+
AC_DEFUN([AC_FIND_FREETYPE],
[
-
AC_ARG_WITH(freetype,AC_HELP_STRING([--with-freetype],[Enable Freetype support for TrueType fonts (YES)]))
have_freetype='no'
if test "$with_freetype" != 'no'; then
- AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no)
- if test "$FREETYPE_CONFIG" = no; then
+ if test -z "$PKG_CONFIG"; then
AC_MSG_WARN(*** Xplanet will be built without freetype support ***)
else
- FREETYPE_CFLAGS="`$FREETYPE_CONFIG --cflags` -I`$FREETYPE_CONFIG --prefix`/include"
- FREETYPE_LIBS=`$FREETYPE_CONFIG --libs`
- AC_SUBST(FREETYPE_CFLAGS)
- AC_SUBST(FREETYPE_LIBS)
+ PKG_CHECK_MODULES([FREETYPE], [freetype2], [have_freetype='yes'], [have_freetype='no'])
AC_DEFINE(HAVE_LIBFREETYPE,,Define if you have freetype)
- have_freetype='yes'
fi
fi
])
@@ -73,8 +69,7 @@ AC_ARG_WITH(pango,AC_HELP_STRING([--with
have_pangoft2='no'
if test "$with_pango" != 'no'; then
- AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
- if test "$PKG_CONFIG" = no; then
+ if test -z "$PKG_CONFIG"; then
AC_MSG_WARN(*** Xplanet will be built without pango support ***)
else
PKG_CHECK_MODULES([PANGOFT2], pangoft2 >= 1.2.0, have_pangoft2='yes', have_pangoft2='no')
|
