Also try X11R7 when looking for X11 files, for NetBSD.

* lib/autoconf/libs.m4 (_AC_PATH_X_DIRECT): Also try directories
with X11R7 in the name.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

diff --git a/ChangeLog b/ChangeLog
index 625bfc91f5dbd38de89101b1bafa739ca906e126..e6e889256216f6a24b51b4a954024dc5189c09b7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-05-11  Patrick Welche  <prlw1@cam.ac.uk>  (tiny change)
+
+       Also try X11R7 when looking for X11 files, for NetBSD.
+       * lib/autoconf/libs.m4 (_AC_PATH_X_DIRECT): Also try directories
+       with X11R7 in the name.
+
 2009-05-01  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        Limit stderr logging for C compiler version.

diff --git a/lib/autoconf/libs.m4 b/lib/autoconf/libs.m4
index cbc42186792643743304a26efa4a85ff4f97c3ed..8f7729bab7f146b82b3be70906a7212463f8e175 100644 (file)
--- a/lib/autoconf/libs.m4
+++ b/lib/autoconf/libs.m4
@@ -236,21 +236,25 @@ m4_define([_AC_PATH_X_DIRECT],
 # Check X11 before X11Rn because it is often a symlink to the current release.
 ac_x_header_dirs='
 /usr/X11/include
+/usr/X11R7/include
 /usr/X11R6/include
 /usr/X11R5/include
 /usr/X11R4/include
 
 /usr/include/X11
+/usr/include/X11R7
 /usr/include/X11R6
 /usr/include/X11R5
 /usr/include/X11R4
 
 /usr/local/X11/include
+/usr/local/X11R7/include
 /usr/local/X11R6/include
 /usr/local/X11R5/include
 /usr/local/X11R4/include
 
 /usr/local/include/X11
+/usr/local/include/X11R7
 /usr/local/include/X11R6
 /usr/local/include/X11R5
 /usr/local/include/X11R4