summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--examples/Makefile.am1
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index afc296fb..1ee603ba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2005-11-14 Behdad Esfahbod <behdad@gnome.org>
+ * examples/Makefile.am: Add X_CFLAGS to INCLUDES. We normally are
+ picking them up from XFT_CFLAGS, but we don't require Xft any more
+ for X11. (#320576)
+
+2005-11-14 Behdad Esfahbod <behdad@gnome.org>
+
* pango/modules.c (pango_module_load), pango/querymodules.c: Pass
G_MODULE_BIND_LAZY to g_module_open. (Pointed by John Rice)
diff --git a/examples/Makefile.am b/examples/Makefile.am
index f655b45f..9df2034c 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -9,6 +9,7 @@ INCLUDES = \
-I$(top_srcdir) \
$(CAIRO_CFLAGS) \
$(GLIB_CFLAGS) \
+ $(X_CFLAGS) \
$(XFT_CFLAGS) \
$(FREETYPE_CFLAGS)