diff options
| author | Jürg Billeter <j@bitron.ch> | 2005-10-28 19:19:42 +0000 |
|---|---|---|
| committer | Jürg Billeter <juergbi@src.gnome.org> | 2005-10-28 19:19:42 +0000 |
| commit | 5dc8072b588df413d3ed41b047de727a9da4946b (patch) | |
| tree | 3a17a01b43b03bb80022aaad62e0705602633d0a | |
| parent | 1685d77cbfc29b0a86860d3e7ac145a7fecf0aed (diff) | |
| download | gdm-5dc8072b588df413d3ed41b047de727a9da4946b.tar.gz | |
Check for X server in prefix /usr
2005-10-28 Jürg Billeter <j@bitron.ch>
* configure.ac: Check for X server in prefix /usr
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | configure.ac | 5 |
2 files changed, 9 insertions, 0 deletions
@@ -1,3 +1,7 @@ +2005-10-28 Jürg Billeter <j@bitron.ch> + + * configure.ac: Check for X server in prefix /usr + 2005-10-27 Erdal Ronahi <erdal.ronahi@gmail.com> * daemon/slave.c: Fix race condition where the d diff --git a/configure.ac b/configure.ac index 9703796a..e112bca1 100644 --- a/configure.ac +++ b/configure.ac @@ -952,6 +952,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 -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 |