From fb2cf22e32305d8d03dfa35b1cabb382e66c9d72 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sat, 4 Oct 2014 00:22:51 -0700 Subject: [PATCH] * configure.ac: Silence warning with some old Xrandr.h. --- ChangeLog | 4 ++++ configure.ac | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 547698d635f..d58680985b2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2014-10-04 Glenn Morris + + * configure.ac: Silence warning with some old Xrandr.h. (Bug#18465) + 2014-10-03 Paul Eggert * configure.ac: Port to strict POSIX shells on non-MinGW (Bug#18612). diff --git a/configure.ac b/configure.ac index b706b814787..dcfbaca706e 100644 --- a/configure.ac +++ b/configure.ac @@ -3377,8 +3377,12 @@ if test "${HAVE_X11}" = "yes"; then EMACS_CHECK_MODULES([XRANDR], [$XRANDR_MODULES]) if test $HAVE_XRANDR = no; then # Test old way in case pkg-config doesn't have it (older machines). + # Include Xrender.h by hand to work around bug in older Xrandr.h + # (e.g. RHEL5) and silence (harmless) configure warning (bug#18465). AC_CHECK_HEADER(X11/extensions/Xrandr.h, - [AC_CHECK_LIB(Xrandr, XRRGetScreenResources, HAVE_XRANDR=yes)]) + [AC_CHECK_LIB(Xrandr, XRRGetScreenResources, HAVE_XRANDR=yes)], + [], [AC_INCLUDES_DEFAULT +#include ]) if test $HAVE_XRANDR = yes; then XRANDR_LIBS=-lXrandr fi -- 2.11.4.GIT