Merge from emacs-24; up to 2012-12-29T06:14:00Z!cyd@gnu.org

[gnu-emacs] / configure.ac

diff --git a/configure.ac b/configure.ac
index 6a360a89c1eddf2753641cebcd459a020da1a370..3cb7bc701dd0d6e5da6390640b8d42c00850fbba 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2644,7 +2644,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.])