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

diff --git a/ChangeLog b/ChangeLog
index 41a23da..f5a26cb 100644 (file)
--- 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 20ba739..bcc647d 100644 (file)
--- 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)