Fixed false positive when checking for X11 on Mac OS X when the X11 development environment isn't installed.
authorSam Lantinga <slouken@libsdl.org>
Thu, 20 Sep 2012 22:01:51 -0700
changeset 6445e43ddbd3d0e2
parent 6444 9a2b329dbd0e
child 6446 80c98458312e
Fixed false positive when checking for X11 on Mac OS X when the X11 development environment isn't installed.
configure
configure.in
     1.1 --- a/configure	Thu Sep 20 21:17:49 2012 -0700
     1.2 +++ b/configure	Thu Sep 20 22:01:51 2012 -0700
     1.3 @@ -18638,7 +18638,10 @@
     1.4          case "$host" in
     1.5              *-*-darwin*)
     1.6                  # This isn't necessary for X11, but fixes GLX detection
     1.7 -                if test "x$x_includes" = xNONE && test "x$x_libraries" = xNONE; then
     1.8 +                if test "x$x_includes" = xNONE && \
     1.9 +                   test "x$x_libraries" = xNONE && \
    1.10 +                   test -d /usr/X11R6/include && \
    1.11 +                   test -d /usr/X11R6/lib; then
    1.12                      x_includes="/usr/X11R6/include"
    1.13                      x_libraries="/usr/X11R6/lib"
    1.14                  fi
     2.1 --- a/configure.in	Thu Sep 20 21:17:49 2012 -0700
     2.2 +++ b/configure.in	Thu Sep 20 22:01:51 2012 -0700
     2.3 @@ -1012,7 +1012,10 @@
     2.4          case "$host" in
     2.5              *-*-darwin*)
     2.6                  # This isn't necessary for X11, but fixes GLX detection
     2.7 -                if test "x$x_includes" = xNONE && test "x$x_libraries" = xNONE; then
     2.8 +                if test "x$x_includes" = xNONE && \
     2.9 +                   test "x$x_libraries" = xNONE && \
    2.10 +                   test -d /usr/X11R6/include && \
    2.11 +                   test -d /usr/X11R6/lib; then
    2.12                      x_includes="/usr/X11R6/include"
    2.13                      x_libraries="/usr/X11R6/lib"
    2.14                  fi