masscollaborationlabs/emacs
2
0
Fork 0
mirror of https://github.com/masscollaborationlabs/emacs.git synced 2025-07-03 10:53:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

* configure.ac: Silence warning with some old Xrandr.h.

Browse source 
Fixes: debbugs:18465
This commit is contained in:
Glenn Morris 2014-10-04 00:22:51 -07:00
parent 10501882f7
commit d311e8d04b
2 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2014-10-04 Glenn Morris <rgm@gnu.org>
* configure.ac: Silence warning with some old Xrandr.h. (Bug#18465)
2014-10-03 Paul Eggert <eggert@cs.ucla.edu>
* configure.ac: Port to strict POSIX shells on non-MinGW (Bug#18612).

6
configure.ac
View file

@ -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 <X11/extensions/Xrender.h>])
if test $HAVE_XRANDR = yes; then
XRANDR_LIBS=-lXrandr
fi