1 --- gdm-2.14.0/configure.ac.orig 2006-03-19 18:04:56.000000000 +0000
2 +++ gdm-2.14.0/configure.ac 2006-03-19 18:05:38.000000000 +0000
7 -# First check with "! -h" for /usr/X11R6 and /usr/X11 since they often
8 -# symlink to each other, and configure should use the more stable
9 -# location (the real directory) if possible.
11 -if test ! -h /usr/X11R6 -a -x /usr/X11R6/bin/X; then
12 - X_PATH="/usr/X11R6/bin"
13 - X_SERVER_PATH="/usr/X11R6/bin"
14 - X_SERVER="/usr/X11R6/bin/X"
15 - GDM_USER_PATH="$GDM_USER_PATH:/usr/X11R6/bin"
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 - GDM_USER_PATH="$GDM_USER_PATH:/usr/X11/bin"
22 - X_CONFIG_OPTIONS="-audit 0"
23 -elif test -x /usr/X11R6/bin/X; then
24 - X_PATH="/usr/X11R6/bin"
25 - X_SERVER_PATH="/usr/X11R6/bin"
26 - X_SERVER="/usr/X11R6/bin/X"
27 - GDM_USER_PATH="$GDM_USER_PATH:/usr/X11R6/bin"
28 - X_CONFIG_OPTIONS="-audit 0"
29 -elif test -x /usr/X11/bin/X; then
30 - X_PATH="/usr/X11/bin"
31 - X_SERVER_PATH="/usr/X11/bin"
32 - X_SERVER="/usr/X11/bin/X"
33 - GDM_USER_PATH="$GDM_USER_PATH:/usr/X11/bin"
34 - X_CONFIG_OPTIONS="-audit 0"
35 -elif test -x /usr/openwin/bin/Xsun; then
36 - # Do not add /usr/openwin/bin here because on Solaris you need
37 - # /usr/openwin/bin in your PATH even if you are using the Xorg
38 - # Xserver. We add this to the path below.
39 - X_PATH="/usr/openwin/bin"
40 - X_SERVER_PATH="/usr/openwin/bin"
41 - X_SERVER="/usr/openwin/bin/Xsun"
42 - X_CONFIG_OPTIONS="-audit 0 -nobanner"
43 -elif test -x /opt/X11R6/bin/X; then
44 - X_PATH="/opt/X11R6/bin"
45 - X_SERVER_PATH="/opt/X11R6/bin"
46 - X_SERVER="/opt/X11R6/bin/X"
47 - GDM_USER_PATH="$GDM_USER_PATH:/opt/X11R6/bin"
48 - X_CONFIG_OPTIONS="-audit 0"
49 -elif test -x /usr/bin/X; then
51 - X_SERVER_PATH="/usr/bin"
52 - X_SERVER="/usr/bin/X"
53 - X_CONFIG_OPTIONS="-audit 0"
55 - # what to do, what to do, this is wrong, but this just sets the
56 - # defaults, perhaps this user is cross compiling or some such
57 - X_PATH="/usr/bin/X11:/usr/X11R6/bin:/opt/X11R6/bin"
58 - X_SERVER_PATH="/usr/X11R6/bin"
59 - X_SERVER="/usr/X11R6/bin/X"
60 - GDM_USER_PATH="$GDM_USER_PATH:/usr/bin/X11:/usr/X11R6/bin:/usr/local/bin:/opt/X11R6/bin"
61 - X_CONFIG_OPTIONS="-audit 0"
64 +X_SERVER_PATH="/usr/bin"
65 +X_SERVER="/usr/bin/X"
66 +X_CONFIG_OPTIONS="-audit 0"
68 # Don't add EXPANDED_BINDIR to GDM_USER_PATH if it is already in the PATH.
69 # If it is /usr/bin, for example.