merge changes from ocaml3111rc0 to ocaml3111

git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@9319 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02

1 files changed, 6 insertions, 0 deletions

diff --git a/configure b/configure
index 629cda8c2..cefeda387 100755
--- a/configure
+++ b/configure
@@ -1215,6 +1215,12 @@ x11_link="not found"
 for dir in \
     $x11_include_dir          \
                               \
+    /usr/X11R7/include        \
+    /usr/include/X11R7        \
+    /usr/local/X11R7/include  \
+    /usr/local/include/X11R7  \
+    /opt/X11R7/include        \
+                              \
     /usr/X11R6/include        \
     /usr/include/X11R6        \
     /usr/local/X11R6/include  \