Fixed false positive when checking for X11 on Mac OS X when the X11 development environment isn't installed.

2012-09-20 22:01:51 -07:00 · 2012-09-20 22:01:51 -07:00 · 31a077b87f
commit 31a077b87f
parent cc76936aae
2 changed files with 8 additions and 2 deletions
--- a/5
+++ b/5
@ -18638,7 +18638,10 @@ fi
        case "$host" in
            *-*-darwin*)
                # This isn't necessary for X11, but fixes GLX detection
-                if test "x$x_includes" = xNONE && test "x$x_libraries" = xNONE; then
+                if test "x$x_includes" = xNONE && \
+                   test "x$x_libraries" = xNONE && \
+                   test -d /usr/X11R6/include && \
+                   test -d /usr/X11R6/lib; then
                    x_includes="/usr/X11R6/include"
                    x_libraries="/usr/X11R6/lib"
                fi