procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Handle case where Xft is found but not XRender

Browse source 
* configure.ac (XFT_LIBS): Ensure that HAVE_XFT is no if
XRender is not found.  (Bug#31634)
This commit is contained in:
Robert Pluim 2018-05-29 20:32:08 +02:00
parent 186280fbbc
commit f212fe512c
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
configure.ac
View file

@ -3210,8 +3210,8 @@ if test "${HAVE_X11}" = "yes"; then
if test "x${with_xft}" != "xno"; then if test "x${with_xft}" != "xno"; then
EMACS_CHECK_MODULES([XFT], [xft >= 0.13.0], [], [HAVE_XFT=no]) EMACS_CHECK_MODULES([XFT], [xft >= 0.13.0], [], [HAVE_XFT=no])
## Because xftfont.c uses XRenderQueryExtension, we also ## Because xterm.c uses XRenderQueryExtension when XFT is
## need to link to -lXrender. ## enabled, we also need to link to -lXrender.
HAVE_XRENDER=no HAVE_XRENDER=no
AC_CHECK_LIB(Xrender, XRenderQueryExtension, HAVE_XRENDER=yes) AC_CHECK_LIB(Xrender, XRenderQueryExtension, HAVE_XRENDER=yes)
if test "$HAVE_XFT" != no && test "$HAVE_XRENDER" != no; then if test "$HAVE_XFT" != no && test "$HAVE_XRENDER" != no; then
@ -3234,6 +3234,9 @@ if test "${HAVE_X11}" = "yes"; then
CPPFLAGS=$OLD_CPPFLAGS CPPFLAGS=$OLD_CPPFLAGS
CFLAGS=$OLD_CFLAGS CFLAGS=$OLD_CFLAGS
LIBS=$OLD_LIBS LIBS=$OLD_LIBS
else
# Make sure XFT is disabled if we found XFT but not XRender
HAVE_XFT=no
fi # "$HAVE_XFT" != no fi # "$HAVE_XFT" != no
fi # "x${with_xft}" != "xno" fi # "x${with_xft}" != "xno"