configure.ac
changeset 13130 502bb7d04f0a
parent 13102 f54a77124843
child 13173 de3493dacdaf
     1.1 --- a/configure.ac	Tue Oct 15 14:55:09 2019 -0400
     1.2 +++ b/configure.ac	Tue Oct 15 22:36:08 2019 -0400
     1.3 @@ -1610,10 +1610,10 @@
     1.4                  # This isn't necessary for X11, but fixes GLX detection
     1.5                  if test "x$x_includes" = xNONE && \
     1.6                     test "x$x_libraries" = xNONE && \
     1.7 -                   test -d /usr/X11R6/include && \
     1.8 -                   test -d /usr/X11R6/lib; then
     1.9 -                    x_includes="/usr/X11R6/include"
    1.10 -                    x_libraries="/usr/X11R6/lib"
    1.11 +                   test -d /opt/X11/include && \
    1.12 +                   test -d /opt/X11/lib; then
    1.13 +                    x_includes="/opt/X11/include"
    1.14 +                    x_libraries="/opt/X11/lib"
    1.15                  fi
    1.16                  ;;
    1.17          esac
    1.18 @@ -1626,15 +1626,16 @@
    1.19  
    1.20              case "$host" in
    1.21                  *-*-darwin*)
    1.22 -                    x11_lib='/usr/X11R6/lib/libX11.6.dylib'
    1.23 -                    x11ext_lib='/usr/X11R6/lib/libXext.6.dylib'
    1.24 -                    xcursor_lib='/usr/X11R6/lib/libXcursor.1.dylib'
    1.25 -                    xinerama_lib='/usr/X11R6/lib/libXinerama.1.dylib'
    1.26 -                    xinput_lib='/usr/X11R6/lib/libXi.6.dylib'
    1.27 -                    xrandr_lib='/usr/X11R6/lib/libXrandr.2.dylib'
    1.28 -                    xrender_lib='/usr/X11R6/lib/libXrender.1.dylib'
    1.29 -                    xss_lib='/usr/X11R6/lib/libXss.1.dylib'
    1.30 -                    xvidmode_lib='/usr/X11R6/lib/libXxf86vm.1.dylib'
    1.31 +                    # Apple now puts this in /opt/X11
    1.32 +                    x11_lib='/opt/X11/lib/libX11.6.dylib'
    1.33 +                    x11ext_lib='/opt/X11/lib/libXext.6.dylib'
    1.34 +                    xcursor_lib='/opt/X11/lib/libXcursor.1.dylib'
    1.35 +                    xinerama_lib='/opt/X11/lib/libXinerama.1.dylib'
    1.36 +                    xinput_lib='/opt/X11/lib/libXi.6.dylib'
    1.37 +                    xrandr_lib='/opt/X11/lib/libXrandr.2.dylib'
    1.38 +                    xrender_lib='/opt/X11/lib/libXrender.1.dylib'
    1.39 +                    xss_lib='/opt/X11/lib/libXss.1.dylib'
    1.40 +                    xvidmode_lib='/opt/X11/lib/libXxf86vm.1.dylib'
    1.41                      ;;
    1.42                  *-*-openbsd*)
    1.43                      x11_lib='libX11.so'