summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
author1 <alexl@redhat.com>2000-12-01 17:14:29 +0000
committerAlexander Larsson <alexl@src.gnome.org>2000-12-01 17:14:29 +0000
commitf3e06d23bf463fa56077f8061fed2e8c0ed16bd9 (patch)
tree7037d0857e024f5a0a87898cd1d24cc27ab08667 /modules
parent97bfa3300d2295c37548377bb7b32d3f696bed3c (diff)
downloadgtk+-f3e06d23bf463fa56077f8061fed2e8c0ed16bd9.tar.gz
Note: GtkFB now requires Freetype 2 final.
2000-12-01 <alexl@redhat.com> * gdk/linux-fb/Makefile.am: * modules/linux-fb/Makefile.am: Freetype 2 final uses freetype-config * gdk/linux-fb/gdkpango-fb.c: Upgrade to use Freetype 2 final. More flexible support for font aliases, this also fixes a bug with GtkFontSelector, as the aliases must be visible in the font/family list, or GtkFontSelector reads uninitialized memory.
Diffstat (limited to 'modules')
-rw-r--r--modules/linux-fb/Makefile.am3
1 files changed, 2 insertions, 1 deletions
diff --git a/modules/linux-fb/Makefile.am b/modules/linux-fb/Makefile.am
index a2cde57e1e..b0f894cab3 100644
--- a/modules/linux-fb/Makefile.am
+++ b/modules/linux-fb/Makefile.am
@@ -6,6 +6,7 @@ INCLUDES = @STRIP_BEGIN@ \
-I$(top_srcdir)/gdk \
-I$(top_builddir)/gdk \
-I$(top_srcdir)/gdk/linux-fb \
+ `freetype-config --cflags'\
@GTK_DEBUG_FLAGS@ \
@GTK_XIM_FLAGS@ \
@GTK_LOCALE_FLAGS@ \
@@ -17,7 +18,7 @@ LDFLAGS = @STRIP_BEGIN@ \
@GLIB_LIBS@ \
@PANGO_CFLAGS@ \
-L/gnome2/lib \
- -lfreetype \
+ `freetype-config --libs` \
-lm \
@STRIP_END@