From: Robert Pluim Date: Tue, 29 May 2018 18:32:08 +0000 (+0200) Subject: Handle case where Xft is found but not XRender X-Git-Tag: emacs-26.1.90~435 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=f212fe512c3b1757310e875882e3d76b7e8fba23;p=emacs.git Handle case where Xft is found but not XRender * configure.ac (XFT_LIBS): Ensure that HAVE_XFT is no if XRender is not found. (Bug#31634) --- diff --git a/configure.ac b/configure.ac index c66c80adbb6..c6101d63538 100644 --- a/configure.ac +++ b/configure.ac @@ -3210,8 +3210,8 @@ if test "${HAVE_X11}" = "yes"; then if test "x${with_xft}" != "xno"; then EMACS_CHECK_MODULES([XFT], [xft >= 0.13.0], [], [HAVE_XFT=no]) - ## Because xftfont.c uses XRenderQueryExtension, we also - ## need to link to -lXrender. + ## Because xterm.c uses XRenderQueryExtension when XFT is + ## enabled, we also need to link to -lXrender. HAVE_XRENDER=no AC_CHECK_LIB(Xrender, XRenderQueryExtension, HAVE_XRENDER=yes) if test "$HAVE_XFT" != no && test "$HAVE_XRENDER" != no; then @@ -3234,6 +3234,9 @@ if test "${HAVE_X11}" = "yes"; then CPPFLAGS=$OLD_CPPFLAGS CFLAGS=$OLD_CFLAGS LIBS=$OLD_LIBS + else + # Make sure XFT is disabled if we found XFT but not XRender + HAVE_XFT=no fi # "$HAVE_XFT" != no fi # "x${with_xft}" != "xno"