summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stone <daniel@fooishbar.org>2005-09-09 05:32:58 +0000
committerDaniel Stone <daniel@fooishbar.org>2005-09-09 05:32:58 +0000
commit30f912cd14e8b7272a95586dc0af429a0fa4c84f (patch)
tree8a46224721659b7808e4bf2f6e01ef51dab3027b
parent4a2f7ae2f3317e53d99daf15ad362230388949d4 (diff)
AC_DEFINE FONTCACHE rather than XFONT_FONTCACHE, as the former is used in
the code, and the latter in Makefile.ams for an AM_CONDITIONAL.
-rw-r--r--ChangeLog6
-rw-r--r--configure.ac2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e98916f..e576545 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-09-09 Daniel Stone <daniel@freedesktop.org>
+
+ * configure.ac:
+ AC_DEFINE FONTCACHE rather than XFONT_FONTCACHE, as the former is used
+ in the code, and the latter in Makefile.ams for an AM_CONDITIONAL.
+
2005-07-10 Kevin E. Martin <kem-at-freedesktop-dot-org>
* src/FreeType/Makefile.am:
diff --git a/configure.ac b/configure.ac
index 528e52a..139ca19 100644
--- a/configure.ac
+++ b/configure.ac
@@ -185,7 +185,7 @@ fi
AC_ARG_ENABLE(fontcache, [ --disable-fontcache ],[XFONT_FONTCACHE=$enableval],[XFONT_FONTCACHE=yes])
AM_CONDITIONAL(XFONT_FONTCACHE, [test "x$XFONT_FONTCACHE" = xyes])
if test "x$XFONT_FONTCACHE" = xyes; then
- AC_DEFINE(XFONT_FONTCACHE,1,[Support the font caching extension])
+ AC_DEFINE(FONTCACHE,1,[Support the font caching extension])
PKG_CHECK_MODULES(FONTCACHEPROTO, fontcacheproto)
else
FONTCACHEPROTO_CFLAGS=""