1 From 202fe64993977f44f51b76264b2fbe4b2878ef7a Mon Sep 17 00:00:00 2001

     2 From: Alan Coopersmith <[email protected]>

     3 Date: Tue, 29 Dec 2015 21:08:59 -0800

     4 Subject: [PATCH 16/19] solaris xserver path

     5 

     6 On Solaris 11 & later, we just use /usr/bin, not /usr/X11/bin.

     7 Need to submit upstream.

     8 ---

     9  configure.ac | 6 +++++-

    10  1 file changed, 5 insertions(+), 1 deletion(-)

    11 

    12 diff --git a/configure.ac b/configure.ac

    13 index cc58fbb..e819e5e 100644

    14 --- a/configure.ac

    15 +++ b/configure.ac

    16 @@ -1169,7 +1169,11 @@ dnl ---------------------------------------------------------------------------

    17  # and /usr/X11 since they often symlink to each other, and configure

    18  # should use the more stable location (the real directory) if possible.

    19  #

    20 -if test -x /usr/X11/bin/Xserver; then

    21 +if test -x /usr/bin/Xserver; then

    22 +   X_PATH="/usr/bin"

    23 +   X_SERVER_PATH="/usr/bin"

    24 +   X_SERVER="/usr/bin/Xserver"

    25 +elif test -x /usr/X11/bin/Xserver; then

    26     X_PATH="/usr/X11/bin"

    27     X_SERVER_PATH="/usr/X11/bin"

    28     X_SERVER="/usr/X11/bin/Xserver"

    29 -- 

    30 2.7.4

    31