blob: 150f79763a2e05c1e0a3672178422bc2268e1eea (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
|
--- gdm-2.26.1/configure.ac-orig 2009-03-16 12:50:10.000000000 -0700
+++ gdm-2.26.1/configure.ac 2009-06-12 16:40:40.000000000 -0700
@@ -1085,62 +1085,10 @@ dnl ------------------------------------
# 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"
- X_CONFIG_OPTIONS="-audit 0"
-elif test ! -h /usr/X11R6 -a -x /usr/X11R6/bin/X; then
- X_PATH="/usr/X11R6/bin"
- X_SERVER_PATH="/usr/X11R6/bin"
- X_SERVER="/usr/X11R6/bin/X"
- X_CONFIG_OPTIONS="-audit 0"
-elif test ! -h /usr/X11 -a -x /usr/X11/bin/X; then
- X_PATH="/usr/X11/bin"
- X_SERVER_PATH="/usr/X11/bin"
- X_SERVER="/usr/X11/bin/X"
- X_CONFIG_OPTIONS="-audit 0"
-elif test -x /usr/X11R6/bin/X; then
- X_PATH="/usr/X11R6/bin"
- X_SERVER_PATH="/usr/X11R6/bin"
- X_SERVER="/usr/X11R6/bin/X"
- 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"
- X_SERVER="/usr/X11/bin/X"
- X_CONFIG_OPTIONS="-audit 0"
-elif test -x /usr/openwin/bin/Xsun; then
- # Do not add /usr/openwin/bin here because on Solaris you need
- # /usr/openwin/bin in your PATH even if you are using the Xorg
- # Xserver. We add this to the path below.
- X_PATH="/usr/openwin/bin"
- X_SERVER_PATH="/usr/openwin/bin"
- X_SERVER="/usr/openwin/bin/Xsun"
- X_CONFIG_OPTIONS="-audit 0 -nobanner"
-elif test -x /opt/X11R6/bin/X; then
- X_PATH="/opt/X11R6/bin"
- X_SERVER_PATH="/opt/X11R6/bin"
- X_SERVER="/opt/X11R6/bin/X"
- 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_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
- X_PATH="/usr/bin/X11:/usr/X11R6/bin:/opt/X11R6/bin"
- X_SERVER_PATH="/usr/X11R6/bin"
- X_SERVER="/usr/X11R6/bin/X"
- X_CONFIG_OPTIONS="-audit 0"
-fi
dnl ---------------------------------------------------------------------------
dnl - Check for Xnest / Xephyr support
|
