Mercurial > emacs
changeset 97799:fc1990cb3e56
Disable XFT and Freetype when without X.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Thu, 28 Aug 2008 20:31:27 +0000 |
| parents | 4abcb09b2bbd |
| children | 0d162f4e0e6b |
| files | configure.in |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.in Thu Aug 28 20:31:19 2008 +0000 +++ b/configure.in Thu Aug 28 20:31:27 2008 +0000 @@ -1808,7 +1808,7 @@ ## Use -lXft if available, unless `--with-freetype=no' nor `--with-xft=no'. HAVE_XFT=maybe -if test "x${with_freetype}" = "xno"; then +if test "x${with_freetype}" = "xno" || test "x${with_x}" = "xno"; then with_xft="no"; fi if test "x${with_xft}" != "xno"; then @@ -1848,7 +1848,7 @@ dnl As we use Xft, we anyway use freetype. dnl In this case, there's no need of additional CFLAGS and LIBS. HAVE_FREETYPE=yes -elif test "x${with_freetype}" != "xno"; then +elif test "x${with_freetype}" != "xno" && test "x${with_x}" != "xno"; then PKG_CHECK_MODULES(FREETYPE, freetype2, HAVE_FREETYPE=yes, HAVE_FREETYPE=no) if test "${HAVE_FREETYPE}" = "yes"; then