From: YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
Date: Mon, 24 Jun 2019 22:24:37 +0000 (+0900)
Subject: * configure.ac: Set HAVE_XFT to no for summary if HAVE_CAIRO is yes.
X-Git-Tag: emacs-27.0.90~2260
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6e2708694140cd3b4ff6aeb39534c4704d6d4e23;p=emacs.git

* configure.ac: Set HAVE_XFT to no for summary if HAVE_CAIRO is yes.
---

diff --git a/configure.ac b/configure.ac
index 0507f58054a..8ff0e21fbf6 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