From 49fca1b6a892543b203bd849772e7068671f8e7d Mon Sep 17 00:00:00 2001
From: Sam Lantinga <slouken@libsdl.org>
Date: Thu, 20 Sep 2012 22:01:51 -0700
Subject: [PATCH] Fixed false positive when checking for X11 on Mac OS X when
 the X11 development environment isn't installed.

---
 configure    | 5 ++++-
 configure.in | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index e52f4740e..9123a14fc 100755
--- a/configure
+++ b/configure
@@ -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
diff --git a/configure.in b/configure.in
index be3b8e89a..799ebcf70 100644
--- 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