1 --- gdm-2.26.1/configure.ac-orig 2009-03-16 12:50:10.000000000 -0700
2 +++ gdm-2.26.1/configure.ac 2009-06-12 16:40:40.000000000 -0700
3 @@ -1085,62 +1085,10 @@ dnl ------------------------------------
4 # and /usr/X11 since they often symlink to each other, and configure
5 # should use the more stable location (the real directory) if possible.
7 -if test -x /usr/X11/bin/Xserver; then
8 - X_PATH="/usr/X11/bin"
9 - X_SERVER_PATH="/usr/X11/bin"
10 - X_SERVER="/usr/X11/bin/Xserver"
11 - X_CONFIG_OPTIONS="-audit 0"
12 -elif test ! -h /usr/X11R6 -a -x /usr/X11R6/bin/X; then
13 - X_PATH="/usr/X11R6/bin"
14 - X_SERVER_PATH="/usr/X11R6/bin"
15 - X_SERVER="/usr/X11R6/bin/X"
16 - X_CONFIG_OPTIONS="-audit 0"
17 -elif test ! -h /usr/X11 -a -x /usr/X11/bin/X; then
18 - X_PATH="/usr/X11/bin"
19 - X_SERVER_PATH="/usr/X11/bin"
20 - X_SERVER="/usr/X11/bin/X"
21 - X_CONFIG_OPTIONS="-audit 0"
22 -elif test -x /usr/X11R6/bin/X; then
23 - X_PATH="/usr/X11R6/bin"
24 - X_SERVER_PATH="/usr/X11R6/bin"
25 - X_SERVER="/usr/X11R6/bin/X"
26 - X_CONFIG_OPTIONS="-audit 0"
27 -elif test -x /usr/bin/Xorg; then
29 - X_SERVER_PATH="/usr/bin"
30 - X_SERVER="/usr/bin/Xorg"
31 - X_CONFIG_OPTIONS="-audit 0"
32 -elif test -x /usr/X11/bin/X; then
33 - X_PATH="/usr/X11/bin"
34 - X_SERVER_PATH="/usr/X11/bin"
35 - X_SERVER="/usr/X11/bin/X"
36 - X_CONFIG_OPTIONS="-audit 0"
37 -elif test -x /usr/openwin/bin/Xsun; then
38 - # Do not add /usr/openwin/bin here because on Solaris you need
39 - # /usr/openwin/bin in your PATH even if you are using the Xorg
40 - # Xserver. We add this to the path below.
41 - X_PATH="/usr/openwin/bin"
42 - X_SERVER_PATH="/usr/openwin/bin"
43 - X_SERVER="/usr/openwin/bin/Xsun"
44 - X_CONFIG_OPTIONS="-audit 0 -nobanner"
45 -elif test -x /opt/X11R6/bin/X; then
46 - X_PATH="/opt/X11R6/bin"
47 - X_SERVER_PATH="/opt/X11R6/bin"
48 - X_SERVER="/opt/X11R6/bin/X"
49 - X_CONFIG_OPTIONS="-audit 0"
50 -elif test -x /usr/bin/X; then
52 X_SERVER_PATH="/usr/bin"
53 - X_SERVER="/usr/bin/X"
54 + X_SERVER="/usr/bin/X"
55 X_CONFIG_OPTIONS="-audit 0"
57 - # what to do, what to do, this is wrong, but this just sets the
58 - # defaults, perhaps this user is cross compiling or some such
59 - X_PATH="/usr/bin/X11:/usr/X11R6/bin:/opt/X11R6/bin"
60 - X_SERVER_PATH="/usr/X11R6/bin"
61 - X_SERVER="/usr/X11R6/bin/X"
62 - X_CONFIG_OPTIONS="-audit 0"
65 dnl ---------------------------------------------------------------------------
66 dnl - Check for Xnest / Xephyr support