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

Fixes: debbugs:14684

diff --git a/ChangeLog b/ChangeLog
index 2a7f2b0e54684f8798634c59a9bcb85d3a8c5a2c..45b6c9152b29b7db0e10dae8f7159cf54183eb0a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.

diff --git a/configure.ac b/configure.ac
index 62f53a3fac24381b7683d73965860d7d8c00140c..0ab66a70c7a642bf6be26fb406f0a38a2a46c6b9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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.])