summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRay Strode <rstrode@redhat.com>2006-08-03 20:49:08 +0000
committerRay Strode <halfline@src.gnome.org>2006-08-03 20:49:08 +0000
commite24e0379a46d6a56a1b72d93778023315ccdc87e (patch)
treef7a3734d13eab2557e8b52e58d35a620a4a8ba8a
parent1ff56966bdfcc15d4da9190b3a4d1f6ebc737a72 (diff)
downloadgdm-e24e0379a46d6a56a1b72d93778023315ccdc87e.tar.gz
look for /usr/bin/Xorg when searching or X servers (bug 349836).
2006-08-03 Ray Strode <rstrode@redhat.com> * configure.ac: look for /usr/bin/Xorg when searching or 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 4fcf14a5..78815226 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 or
+ X servers (bug 349836).
+
2006-08-03 Brian Cameron <brian.cameron@sun.com>
* daemon/slave.c: Remove calls to syslog/malloc that are called
diff --git a/configure.ac b/configure.ac
index 35c7604d..52289719 100644
--- a/configure.ac
+++ b/configure.ac
@@ -988,6 +988,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"