[pango] build: Only enable freetype if fontconfig is also available
- From: Philip Withnall <pwithnall src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pango] build: Only enable freetype if fontconfig is also available
- Date: Wed, 10 Jan 2018 10:58:48 +0000 (UTC)
commit 1addea2febecb9e3511329b985d5566de6d8369e
Author: Philip Withnall <withnall endlessm com>
Date: Tue Jan 9 11:05:29 2018 +0000
build: Only enable freetype if fontconfig is also available
This changes meson.build to match what configure.ac already does. The
code doesn’t have separate conditions for whether fontconfig and
freetype are available: if freetype compilation is enabled, it assumes
that fontconfig is also available.
Previously, systems with freetype available, but no fontconfig, would
fail to compile Pango due to trying to link against non-existent
fontconfig symbols.
Signed-off-by: Philip Withnall <withnall endlessm com>
https://bugzilla.gnome.org/show_bug.cgi?id=792363
meson.build | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
---
diff --git a/meson.build b/meson.build
index db9241c..494104b 100644
--- a/meson.build
+++ b/meson.build
@@ -229,8 +229,9 @@ if fontconfig_dep.found()
endif
# The first version of freetype with a pkg-config file is 2.1.5
+# We require both fontconfig and freetype if we are to have either.
freetype_dep = dependency('freetype2', required: false)
-if freetype_dep.found()
+if freetype_dep.found() and fontconfig_dep.found()
pango_conf.set('HAVE_FREETYPE', 1)
pango_deps += freetype_dep
endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]