diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2005-07-01 21:24:31 +0000 |
|---|---|---|
| committer | Daniel Stone <daniel@fooishbar.org> | 2005-07-01 21:24:31 +0000 |
| commit | 12cca25eea410bfd536ada44e252d79e0896ffa2 (patch) | |
| tree | 5325e3698182fd16180ae4e4f1aa1ee4eac0b775 | |
| parent | 4534fa0c8adb77b7db47101318e0e863edb186ce (diff) | |
Default --enable-fc to yes; minor formatting changes.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | configure.ac | 11 |
2 files changed, 11 insertions, 7 deletions
@@ -1,4 +1,9 @@ -Fri Jun 17 16:13:18 2005 Søren Sandmann <sandmann@redhat.com> +2005-07-02 Daniel Stone <daniel@freedesktop.org> + + * configure.ac: + Enable font services by default; minor formatting cleanup. + +2005-06-17 Søren Sandmann <sandmann@redhat.com> * configure.ac (XFONT_SPEEDO): Disable Speedo by default. diff --git a/configure.ac b/configure.ac index eec4c4a..1b627d2 100644 --- a/configure.ac +++ b/configure.ac @@ -79,8 +79,8 @@ AC_SUBST(FREETYPE_LIBS) AC_SUBST(FREETYPE_CFLAGS) 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 +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]) PKG_CHECK_MODULES(FONTCACHEPROTO, fontcacheproto) else @@ -88,9 +88,9 @@ else fi AC_SUBST(FONTCACHEPROTO_CFLAGS) -AC_ARG_ENABLE(fc, [ --enable-fc ],[XFONT_FC=$enableval],[XFONT_FC=no]) -AM_CONDITIONAL(XFONT_FC, [test x$XFONT_FC = xyes]) -if test x$XFONT_FC = xyes; then +AC_ARG_ENABLE(fc, [ --disable-fc ],[XFONT_FC=$enableval],[XFONT_FC=yes]) +AM_CONDITIONAL(XFONT_FC, [test "x$XFONT_FC" = xyes]) +if test "x$XFONT_FC" = xyes; then AC_DEFINE(XFONT_FC,1,[Support the X Font Services Protocol]) fi @@ -126,7 +126,6 @@ fi AM_CONDITIONAL(XFONT_FONTFILE, [test "x$XFONT_FONTFILE" = xyes]) if test "x$XFONT_FONTFILE" = xyes; then AC_DEFINE(XFONT_FONTFILE,,[Support fonts in files]) - fi AC_CHECK_LIB(z, gzopen, [Z_LIBS=-lz |