aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYAMAMOTO Mitsuharu2019-06-25 07:24:37 +0900
committerYAMAMOTO Mitsuharu2019-06-25 07:24:37 +0900
commit6e2708694140cd3b4ff6aeb39534c4704d6d4e23 (patch)
tree4ff4a404760263d5076f71eefc2af3f5866803c1
parentd3ae5e1836eb91be4ca89c7bb83c8d73200f6036 (diff)
downloademacs-6e2708694140cd3b4ff6aeb39534c4704d6d4e23.tar.gz
emacs-6e2708694140cd3b4ff6aeb39534c4704d6d4e23.zip
* configure.ac: Set HAVE_XFT to no for summary if HAVE_CAIRO is yes.
-rw-r--r--configure.ac2
1 files changed, 2 insertions, 0 deletions
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
3353 EMACS_CHECK_MODULES([FONTCONFIG], [fontconfig >= 2.2.0]) 3353 EMACS_CHECK_MODULES([FONTCONFIG], [fontconfig >= 2.2.0])
3354 3354
3355 test "$HAVE_FONTCONFIG" = "no" && AC_MSG_ERROR(cairo requires libfontconfig) 3355 test "$HAVE_FONTCONFIG" = "no" && AC_MSG_ERROR(cairo requires libfontconfig)
3356 dnl For the "Does Emacs use" message at the end.
3357 HAVE_XFT=no
3356 else 3358 else
3357 ## Use -lXft if available, unless '--with-xft=no'. 3359 ## Use -lXft if available, unless '--with-xft=no'.
3358 HAVE_XFT=maybe 3360 HAVE_XFT=maybe