Skip to content
This repository has been archived by the owner on Feb 11, 2021. It is now read-only.

Commit

Permalink
Browse files Browse the repository at this point in the history
Fixed false positive when checking for X11 on Mac OS X when the X11 d…
…evelopment environment isn't installed.
  • Loading branch information
slouken committed Sep 21, 2012
1 parent 7d05903 commit 49fca1b
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
5 changes: 4 additions & 1 deletion configure
Expand Up @@ -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
Expand Down
5 changes: 4 additions & 1 deletion configure.in
Expand Up @@ -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
Expand Down

0 comments on commit 49fca1b

Please sign in to comment.