Fixed false positive when checking for X11 on Mac OS X when the X11 d…

…evelopment environment isn't installed.
libsdl-org · Sep 21, 2012 · 49fca1b6a892543b203bd849772e7068671f8e7d · 49fca1b
1 parent 7d05903
commit 49fca1b6a892543b203bd849772e7068671f8e7d
Unified Split

Showing with 8 additions and 2 deletions.

+4 −1 configure

+4 −1 configure.in
diff --git a/configure b/configure

         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
diff --git a/configure.in b/configure.in
@@ -1012,7 +1012,10 @@ AC_HELP_STRING([--enable-video-x11], [use X11 video driver [[default=yes]]]),
         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