[Emacs-diffs] trunk r118034: * configure.ac: Silence warning with some old Xrandr.h.

[Glenn Morris]

------------------------------------------------------------
revno: 118034
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/18465
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2014-10-04 00:22:51 -0700
message:
  * configure.ac: Silence warning with some old Xrandr.h.
modified:
  ChangeLog                      changelog-20091113204419-o5vbwnq5f7feedwu-1538
  configure.ac                   
configure.in-20091113204419-o5vbwnq5f7feedwu-783

=== modified file 'ChangeLog'
--- a/ChangeLog 2014-10-03 15:44:46 +0000
+++ b/ChangeLog 2014-10-04 07:22:51 +0000
@@ -1,3 +1,7 @@
+2014-10-04  Glenn Morris  <address@hidden>
+
+       * configure.ac: Silence warning with some old Xrandr.h.  (Bug#18465)
+
 2014-10-03  Paul Eggert  <address@hidden>
 
        * configure.ac: Port to strict POSIX shells on non-MinGW (Bug#18612).

=== modified file 'configure.ac'
--- a/configure.ac      2014-10-03 15:44:46 +0000
+++ b/configure.ac      2014-10-04 07:22:51 +0000
@@ -3377,8 +3377,12 @@
   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 <X11/extensions/Xrender.h>])
     if test $HAVE_XRANDR = yes; then
       XRANDR_LIBS=-lXrandr
     fi