diff options
| author | Alan Coopersmith <alan.coopersmith@sun.com> | 2006-10-05 18:12:50 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@sun.com> | 2006-10-05 18:12:50 -0700 |
| commit | 5dfff0eb0f532edb1f4a25daa5529e08dd832ecb (patch) | |
| tree | 7af82b3e7fa412fe756769f47a10d0552a4e534d | |
| parent | 264df52d24f585915e0d9823d5f087cf23e3fc75 (diff) | |
--disable-builtins should not force off all bitmap support
| -rw-r--r-- | configure.ac | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index f68f7e1..4677a55 100644 --- a/configure.ac +++ b/configure.ac @@ -152,33 +152,30 @@ AC_ARG_ENABLE(builtins, [ --disable-builtins ], [XFONT_BUILTINS=$enableval], [XF AM_CONDITIONAL(XFONT_BUILTINS, [test "x$XFONT_BUILTINS" = xyes ]) if test "x$XFONT_BUILTINS" = xyes; then AC_DEFINE(XFONT_BUILTINS,1,[Support built-in fonts]) - XFONT_PCFFORMAT=yes + XFONT_BITMAP=yes fi AC_ARG_ENABLE(pcfformat, [ --disable-pcfformat ], [XFONT_PCFFORMAT=$enableval], [XFONT_PCFFORMAT=yes]) AM_CONDITIONAL(XFONT_PCFFORMAT, [test "x$XFONT_PCFFORMAT" = xyes]) -if test "x$XFONT_BUILTINS" = xyes; then +if test "x$XFONT_PCFFORMAT" = xyes; then AC_DEFINE(XFONT_PCFFORMAT,1,[Support pcf format bitmap font files]) XFONT_BITMAP=yes fi AC_ARG_ENABLE(bdfformat, [ --disable-bdfformat ], [XFONT_BDFFORMAT=$enableval], [XFONT_BDFFORMAT=yes]) AM_CONDITIONAL(XFONT_BDFFORMAT, [test "x$XFONT_BDFFORMAT" = xyes]) -if test "x$XFONT_BUILTINS" = xyes; then +if test "x$XFONT_BDFFORMAT" = xyes; then AC_DEFINE(XFONT_BDFFORMAT,1,[Support bdf format bitmap font files]) XFONT_BITMAP=yes fi AC_ARG_ENABLE(snfformat, [ --disable-snfformat ], [XFONT_SNFFORMAT=$enableval], [XFONT_SNFFORMAT=yes]) AM_CONDITIONAL(XFONT_SNFFORMAT, [test "x$XFONT_SNFFORMAT" = xyes]) -if test "x$XFONT_BUILTINS" = xyes; then +if test "x$XFONT_SNFFORMAT" = xyes; then AC_DEFINE(XFONT_SNFFORMAT,1,[Support snf format bitmap font files]) XFONT_BITMAP=yes fi -AC_ARG_ENABLE(bdfformat, [ --disable-bdfformat ], [XFONT_BDFFORMAT=$enableval], [XFONT_BDFFORMAT=yes]) -AC_ARG_ENABLE(snfformat, [ --disable-snfformat ], [XFONT_SNFFORMAT=$enableval], [XFONT_SNFFORMAT=yes]) - AM_CONDITIONAL(XFONT_BITMAP, [test "x$XFONT_BITMAP" = xyes ]) if test "x$XFONT_BITMAP" = xyes; then AC_DEFINE(XFONT_BITMAP,1,[Support bitmap font files]) @@ -187,7 +184,7 @@ 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]) + AC_DEFINE(XFONT_FONTFILE,1,[Support fonts in files]) fi # |