diff options
| author | Glenn Morris | 2008-02-02 03:44:32 +0000 |
|---|---|---|
| committer | Glenn Morris | 2008-02-02 03:44:32 +0000 |
| commit | d41e8664f2f108ad89733c38af47d974360ab3a4 (patch) | |
| tree | 90e083d4af9d0bd645a570ae676afb924e8fd7cb | |
| parent | 9209bb239e8c6967f398faf207acf99bba76121a (diff) | |
| download | emacs-d41e8664f2f108ad89733c38af47d974360ab3a4.tar.gz emacs-d41e8664f2f108ad89733c38af47d974360ab3a4.zip | |
(HAVE_XFT): Ensure it is either "yes" or "no".
(USE_FONT_BACKEND, HAVE_FREETYPE, HAVE_M17N_FLT, HAVE_LIBOTF)
(HAVE_XFT): Add "Does Emacs use..." messages at end.
| -rw-r--r-- | configure.in | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/configure.in b/configure.in index 37b19900638..9476b5fb931 100644 --- a/configure.in +++ b/configure.in | |||
| @@ -2046,6 +2046,11 @@ if test "${HAVE_X11}" = "yes"; then | |||
| 2046 | fi | 2046 | fi |
| 2047 | fi | 2047 | fi |
| 2048 | fi | 2048 | fi |
| 2049 | dnl For the "Does Emacs use" message at the end. | ||
| 2050 | if test "$HAVE_XFT" != "yes"; then | ||
| 2051 | HAVE_XFT=no | ||
| 2052 | fi | ||
| 2053 | |||
| 2049 | 2054 | ||
| 2050 | HAVE_FREETYPE=no | 2055 | HAVE_FREETYPE=no |
| 2051 | ### Use -lfreetype if available, unless `--with-freetype=no'. | 2056 | ### Use -lfreetype if available, unless `--with-freetype=no'. |
| @@ -3069,6 +3074,14 @@ echo " Does Emacs use -lpng? ${HAVE_PNG}" | |||
| 3069 | echo " Does Emacs use -lrsvg-2? ${HAVE_RSVG}" | 3074 | echo " Does Emacs use -lrsvg-2? ${HAVE_RSVG}" |
| 3070 | echo " Does Emacs use -lgpm? ${HAVE_GPM}" | 3075 | echo " Does Emacs use -lgpm? ${HAVE_GPM}" |
| 3071 | echo " Does Emacs use -ldbus? ${HAVE_DBUS}" | 3076 | echo " Does Emacs use -ldbus? ${HAVE_DBUS}" |
| 3077 | echo " Does Emacs use a font backend? ${USE_FONT_BACKEND}" | ||
| 3078 | |||
| 3079 | if test "${USE_FONT_BACKEND}" = "yes"; then | ||
| 3080 | echo " Does Emacs use -lfreetype? ${HAVE_FREETYPE}" | ||
| 3081 | echo " Does Emacs use -lm17n-flt? ${HAVE_M17N_FLT}" | ||
| 3082 | echo " Does Emacs use -lotf? ${HAVE_LIBOTF}" | ||
| 3083 | echo " Does Emacs use -lxft? ${HAVE_XFT}" | ||
| 3084 | fi | ||
| 3072 | echo " Does Emacs use X toolkit scroll bars? ${USE_TOOLKIT_SCROLL_BARS}" | 3085 | echo " Does Emacs use X toolkit scroll bars? ${USE_TOOLKIT_SCROLL_BARS}" |
| 3073 | echo | 3086 | echo |
| 3074 | 3087 | ||