[Emacs-diffs] master 6e27086: * configure.ac: Set HAVE_XFT to no for summary if HAVE_CAIRO is yes.

[YAMAMOTO Mitsuharu]

branch: master
commit 6e2708694140cd3b4ff6aeb39534c4704d6d4e23
Author: YAMAMOTO Mitsuharu <address@hidden>
Commit: YAMAMOTO Mitsuharu <address@hidden>

    * configure.ac: Set HAVE_XFT to no for summary if HAVE_CAIRO is yes.
---
 configure.ac | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/configure.ac b/configure.ac
index 0507f58..8ff0e21 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3353,6 +3353,8 @@ if test "${HAVE_X11}" = "yes"; then
     EMACS_CHECK_MODULES([FONTCONFIG], [fontconfig >= 2.2.0])
 
     test "$HAVE_FONTCONFIG" = "no" && AC_MSG_ERROR(cairo requires 
libfontconfig)
+    dnl For the "Does Emacs use" message at the end.
+    HAVE_XFT=no
   else
     ## Use -lXft if available, unless '--with-xft=no'.
     HAVE_XFT=maybe