* configure.ac: Include X11/X.h when testing for Xft.h.

Fixes: debbugs:14684
This commit is contained in:
Glenn Morris 2013-06-21 20:28:07 -04:00
parent e8b3825d3d
commit ab6a27d879
2 changed files with 6 additions and 1 deletions

View file

@ -1,3 +1,7 @@
2013-06-22 Glenn Morris <rgm@fencepost.gnu.org>
* configure.ac: Include X11/X.h when testing for Xft.h. (Bug#14684)
2013-03-11 Glenn Morris <rgm@gnu.org>
* Version 24.3 released.

View file

@ -2425,7 +2425,8 @@ if test "${HAVE_X11}" = "yes"; then
XFT_LIBS="-lXrender $XFT_LIBS"
LIBS="$XFT_LIBS $LIBS"
AC_CHECK_HEADER(X11/Xft/Xft.h,
AC_CHECK_LIB(Xft, XftFontOpen, HAVE_XFT=yes, , $XFT_LIBS))
AC_CHECK_LIB(Xft, XftFontOpen, HAVE_XFT=yes, , $XFT_LIBS) , ,
[[#include <X11/X.h>]])
if test "${HAVE_XFT}" = "yes"; then
AC_DEFINE(HAVE_XFT, 1, [Define to 1 if you have the Xft library.])