[Emacs-diffs] emacs-24 r111357: * configure.ac: Include X11/X.h when testing for Xft.h.

[Glenn Morris]

------------------------------------------------------------
revno: 111357
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/14684
committer: Glenn Morris <address@hidden>
branch nick: emacs-24
timestamp: Fri 2013-06-21 20:28:07 -0400
message:
  * configure.ac: Include X11/X.h when testing for Xft.h.
modified:
  ChangeLog                      changelog-20091113204419-o5vbwnq5f7feedwu-1538
  configure.ac                   
configure.in-20091113204419-o5vbwnq5f7feedwu-783

=== modified file 'ChangeLog'
--- a/ChangeLog 2013-03-11 02:35:23 +0000
+++ b/ChangeLog 2013-06-22 00:28:07 +0000
@@ -1,3 +1,7 @@
+2013-06-22  Glenn Morris  <address@hidden>
+
+       * configure.ac: Include X11/X.h when testing for Xft.h.  (Bug#14684)
+
 2013-03-11  Glenn Morris  <address@hidden>
 
        * Version 24.3 released.

=== modified file 'configure.ac'
--- a/configure.ac      2013-03-05 17:25:50 +0000
+++ b/configure.ac      2013-06-22 00:28:07 +0000
@@ -2425,7 +2425,8 @@
        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.])