From: Glenn Morris <rgm@gnu.org>
Date: Sat, 22 Jun 2013 00:28:07 +0000 (-0400)
Subject: * configure.ac: Include X11/X.h when testing for Xft.h.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1943^2~11
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ab6a27d8790f43e45194ab3c2ed7b3e1130f3718;p=emacs.git

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

Fixes: debbugs:14684
---

diff --git a/ChangeLog b/ChangeLog
index 2a7f2b0e546..45b6c9152b2 100644
--- 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 62f53a3fac2..0ab66a70c7a 100644
--- 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.])