summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBehdad Esfahbod <behdad@gnome.org>2008-01-29 23:30:03 +0000
committerBehdad Esfahbod <behdad@src.gnome.org>2008-01-29 23:30:03 +0000
commit7f197a73269f2ad53f53abb3c9d52dfee6eae676 (patch)
tree83d0744965863214b8c87077447374558e6888ea
parent28a07501084127ca2e0abdbe02f2206e73ccf20e (diff)
downloadpango-7f197a73269f2ad53f53abb3c9d52dfee6eae676.tar.gz
Oops. Add fontconfig cflags/libs with freetype's.
2008-01-29 Behdad Esfahbod <behdad@gnome.org> * configure.in: Oops. Add fontconfig cflags/libs with freetype's. svn path=/trunk/; revision=2561
-rw-r--r--ChangeLog4
-rw-r--r--configure.in3
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 41a23daf..f5a26cb5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2008-01-29 Behdad Esfahbod <behdad@gnome.org>
+ * configure.in: Oops. Add fontconfig cflags/libs with freetype's.
+
+2008-01-29 Behdad Esfahbod <behdad@gnome.org>
+
Bug 496244 – Don't use freetype-config, use pkg-config
* configure.in:
diff --git a/configure.in b/configure.in
index 20ba739e..bcc647d8 100644
--- a/configure.in
+++ b/configure.in
@@ -232,6 +232,9 @@ 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)