diff options
| author | Jürg Billeter <j@bitron.ch> | 2005-11-21 16:54:07 +0000 |
|---|---|---|
| committer | Jürg Billeter <juergbi@src.gnome.org> | 2005-11-21 16:54:07 +0000 |
| commit | 377e423adbe36e2b4852e7372600e964f6dd6c4b (patch) | |
| tree | 9af9249334c7b65aad9c5dff1bc7ffe8295dcdb1 | |
| parent | 2f1cbf79d3e3ed10e82f944a210316fb6df7cc5f (diff) | |
| download | gdm-377e423adbe36e2b4852e7372600e964f6dd6c4b.tar.gz | |
Check for X server in prefix /usr. Fixes bug #320104.
2005-11-21 Jürg Billeter <j@bitron.ch>
* configure.in: Check for X server in prefix /usr.
Fixes bug #320104.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.in | 5 |
2 files changed, 10 insertions, 0 deletions
@@ -1,3 +1,8 @@ +2005-11-21 Jürg Billeter <j@bitron.ch> + + * configure.in: Check for X server in prefix /usr. + Fixes bug #320104. + 2005-11-16 Brian Cameron <Brian.Cameron@sun.com> * daemon/getvt.c: Fix #ifdef's. diff --git a/configure.in b/configure.in index 001f3e83..25db3b4f 100644 --- a/configure.in +++ b/configure.in @@ -964,6 +964,11 @@ elif test -x /opt/X11R6/bin/X; then X_SERVER="/opt/X11R6/bin/X" GDM_USER_PATH="$GDM_USER_PATH:/opt/X11R6/bin" X_CONFIG_OPTIONS="-audit 0" +elif test -x /usr/bin/X; then + X_PATH="/usr/bin" + X_SERVER_PATH="/usr/bin" + X_SERVER="/usr/bin/X" + X_CONFIG_OPTIONS="-audit 0" else # what to do, what to do, this is wrong, but this just sets the # defaults, perhaps this user is cross compiling or some such |