summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRay Strode <rstrode@redhat.com>2006-08-03 20:45:53 +0000
committerRay Strode <halfline@src.gnome.org>2006-08-03 20:45:53 +0000
commit9fb8500b96847a6ba5159064a5ef8857ed0f0c42 (patch)
treeaa01b2e58843b362482f510c31c19e6b20247701
parentc1347d7b20f03bca9ae5b6bc0da631de20949fc0 (diff)
downloadgdm-9fb8500b96847a6ba5159064a5ef8857ed0f0c42.tar.gz
look for /usr/bin/Xorg when searching for X servers (bug 349836).
2006-08-03 Ray Strode <rstrode@redhat.com> * configure.ac: look for /usr/bin/Xorg when searching for X servers (bug 349836).
-rw-r--r--ChangeLog5
-rw-r--r--configure.ac5
2 files changed, 10 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 458565fd..fb1b2a06 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-08-03 Ray Strode <rstrode@redhat.com>
+
+ * configure.ac: look for /usr/bin/Xorg when searching for
+ X servers (bug 349836).
+
2006-08-03 Brian Cameron <brian.cameron@sun.com>
* config/gdm.conf.in, config/gdm.conf-custom: Improved comments
diff --git a/configure.ac b/configure.ac
index e3bc5356..e8706f66 100644
--- a/configure.ac
+++ b/configure.ac
@@ -987,6 +987,11 @@ elif test -x /usr/X11R6/bin/X; then
X_SERVER="/usr/X11R6/bin/X"
GDM_USER_PATH="$GDM_USER_PATH:/usr/X11R6/bin"
X_CONFIG_OPTIONS="-audit 0"
+elif test -x /usr/bin/Xorg; then
+ X_PATH="/usr/bin"
+ X_SERVER_PATH="/usr/bin"
+ X_SERVER="/usr/bin/Xorg"
+ X_CONFIG_OPTIONS="-audit 0"
elif test -x /usr/X11/bin/X; then
X_PATH="/usr/X11/bin"
X_SERVER_PATH="/usr/X11/bin"