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
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
|
From fcc36764a5f7bb0db70c26ed46ce01dc5a3f9fa4 Mon Sep 17 00:00:00 2001
From: Tony Graham <vendor.github@mentea.net>
Date: Sat, 5 Jan 2019 22:00:06 +0000
Subject: [PATCH] Using 'pkg-config' to find FreeType 2 (closes Debian 892348).
Upped version to 0.6.3.
---
xmlroff/configure.ac | 25 +++++++++++--------------
1 file changed, 11 insertions(+), 14 deletions(-)
diff --git a/xmlroff/configure.ac b/xmlroff/configure.ac
index 5b67fb4..5648dc8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,7 +19,7 @@ dnl xmlroff_interface_age = 0;
m4_define([xmlroff_version_major],0)
m4_define([xmlroff_version_minor],6)
-m4_define([xmlroff_version_micro],2)
+m4_define([xmlroff_version_micro],3)
m4_define([xmlroff_interface_age],0)
m4_define([xmlroff_version],
[xmlroff_version_major.xmlroff_version_minor.xmlroff_version_micro])
@@ -159,7 +159,7 @@ PKG_CHECK_MODULES(GTK_DOC,
gtk-doc >= $GTK_DOC_MIN_VERSION,
have_gtk_doc=true,
:)
-AC_MSG_RESULT($have_gtk_doc)
+#AC_MSG_RESULT($have_gtk_doc)
AM_CONDITIONAL(HAVE_GTK_DOC, $have_gtk_doc)
AC_SUBST(HAVE_GTK_DOC, $have_gtk_doc)
@@ -251,19 +251,16 @@ AC_SUBST(REBUILD)
#
# Checks for FreeType
#
-FREETYPE_LIBS=
-FREETYPE_CFLAGS=
+FREETYPE_PACKAGES=freetype2
+#FREETYPE_REQUIRED_VERSION=1.0.3
+
have_freetype=false
-AC_PATH_PROG(FREETYPE_CONFIG, freetype-config, no)
-if test "x$FREETYPE_CONFIG" != "xno" ; then
- FREETYPE_CFLAGS=`$FREETYPE_CONFIG --cflags`
- FREETYPE_LIBS=`$FREETYPE_CONFIG --libs`
- AC_CHECK_LIB(freetype, FT_New_Face, have_freetype=true
- ,:,$FREETYPE_LIBS)
-fi
-AC_SUBST(FREETYPE_LIBS)
-AC_SUBST(FREETYPE_CFLAGS)
+PKG_CHECK_MODULES(FREETYPE,
+ $FREETYPE_PACKAGES,
+ have_freetype=true,
+ :)
+
AM_CONDITIONAL(HAVE_FREETYPE, $have_freetype)
AH_TEMPLATE([ENABLE_GP],
@@ -452,7 +449,7 @@ case "$host" in
xmlroff_platform_win32=no
;;
esac
-AC_MSG_RESULT([$xmlroff_platform_win32])
+#AC_MSG_RESULT([$xmlroff_platform_win32])
AM_CONDITIONAL(PLATFORM_WIN32, test "$xmlroff_platform_win32" = "yes")
AH_TEMPLATE([PIXELS_PER_INCH],
|
