diff options
| author | Behdad Esfahbod <behdad@behdad.org> | 2015-04-30 12:42:02 -0400 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@behdad.org> | 2015-04-30 12:42:02 -0400 |
| commit | 6406594cae082f5295d5fe7b9529d06fc61f9899 (patch) | |
| tree | 8c08af0b9ccfa4330ff9b8daeb3013be315c6948 | |
| parent | be8941dc47404534a561ea32fc968df6c44d341c (diff) | |
| download | pango-6406594cae082f5295d5fe7b9529d06fc61f9899.tar.gz | |
Minor
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | pango/Makefile.am | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index d5b07963..7d2f70d8 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 a61ae4cd..0f9fa689 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 |