[pango] Minor
- From: Behdad Esfahbod <behdad src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pango] Minor
- Date: Thu, 30 Apr 2015 16:47:34 +0000 (UTC)
commit 6406594cae082f5295d5fe7b9529d06fc61f9899
Author: Behdad Esfahbod <behdad behdad org>
Date: Thu Apr 30 12:42:02 2015 -0400
Minor
configure.ac | 3 ---
pango/Makefile.am | 2 ++
2 files changed, 2 insertions(+), 3 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index d5b0796..7d2f70d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -236,9 +236,6 @@ if $have_fontconfig ; then
fi
if $have_freetype ; then
AC_DEFINE(HAVE_FREETYPE, 1, [Have FreeType 2 library])
- # By freetype, we really always mean freetype+fontconfig
- FREETYPE_CFLAGS="$FREETYPE_CFLAGS $FONTCONFIG_CFLAGS"
- FREETYPE_LIBS="$FREETYPE_LIBS $FONTCONFIG_LIBS"
fi
AM_CONDITIONAL(HAVE_FREETYPE, $have_freetype)
diff --git a/pango/Makefile.am b/pango/Makefile.am
index a61ae4c..0f9fa68 100644
--- a/pango/Makefile.am
+++ b/pango/Makefile.am
@@ -27,6 +27,7 @@ INCLUDES = \
$(CAIRO_CFLAGS) \
$(HARFBUZZ_CFLAGS) \
$(FREETYPE_CFLAGS) \
+ $(FONTCONFIG_CFLAGS) \
$(LIBTHAI_CFLAGS) \
$(X_CFLAGS)
@@ -190,6 +191,7 @@ libpangoft2_1_0_la_LIBADD = \
$(GLIB_LIBS) \
$(HARFBUZZ_LIBS) \
$(FREETYPE_LIBS) \
+ $(FONTCONFIG_LIBS) \
$(libm)
libpangoft2_1_0_la_DEPENDENCIES = \
libpango-$(PANGO_API_VERSION).la
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]