diff options
| author | Brian Cameron <brian.cameron@sun.com> | 2007-05-09 04:36:13 +0000 |
|---|---|---|
| committer | Brian Cameron <bcameron@src.gnome.org> | 2007-05-09 04:36:13 +0000 |
| commit | fb4aa10818bbf9b4c082c299d916fda890d91f99 (patch) | |
| tree | b58b470588b45d55ea2322a3ab0843446491fe46 | |
| parent | 848c91755b5f06313156b2b4e3c3195c5d069d1a (diff) | |
| download | gdm-fb4aa10818bbf9b4c082c299d916fda890d91f99.tar.gz | |
Fix check for Xserver to work on Solaris also.
2007-05-09 Brian Cameron <brian.cameron@sun.com>
* configure.ac: Fix check for Xserver to work on Solaris
also.
svn path=/trunk/; revision=4905
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.ac | 17 |
2 files changed, 18 insertions, 4 deletions
@@ -1,5 +1,10 @@ 2007-05-09 Brian Cameron <brian.cameron@sun.com> + * configure.ac: Fix check for Xserver to work on Solaris + also. + +2007-05-09 Brian Cameron <brian.cameron@sun.com> + * configure.ac: Fix check for Xserver to work for Debian and Ubuntu. Fixes bug #436879. Patch by Lo\357c Minier <lool+gnome@via.ecp.fr> diff --git a/configure.ac b/configure.ac index 798f64a6..aecec443 100644 --- a/configure.ac +++ b/configure.ac @@ -1034,11 +1034,20 @@ case "$host" in ;; esac -# First check with "! -h" for /usr/X11R6 and /usr/X11 since they often -# symlink to each other, and configure should use the more stable -# location (the real directory) if possible. +# On Solaris, the /usr/bin/Xserver script is used to decide whether to +# use Xsun or Xorg, so this is used on Solaris. # -if test ! -h /usr/X11R6 -a ! -h /usr/X11R6/bin -a -x /usr/X11R6/bin/X; then +# When testing for /usr/X11R6, first check with "! -h" for /usr/X11R6 +# and /usr/X11 since they often symlink to each other, and configure +# should use the more stable location (the real directory) if possible. +# +if test -x /usr/X11/bin/Xserver; then + X_PATH="/usr/X11/bin" + X_SERVER_PATH="/usr/X11/bin" + X_SERVER="/usr/X11/bin/Xserver" + GDM_USER_PATH="$GDM_USER_PATH:/usr/X11/bin" + X_CONFIG_OPTIONS="-audit 0" +elif test ! -h /usr/X11R6 -a ! -h /usr/X11R6/bin -a -x /usr/X11R6/bin/X; then X_PATH="/usr/X11R6/bin" X_SERVER_PATH="/usr/X11R6/bin" X_SERVER="/usr/X11R6/bin/X" |