1 diff -aurN gdm-2.15.9.orig/configure.ac gdm-2.15.9/configure.ac
2 --- gdm-2.15.9.orig/configure.ac 2006-08-07 21:56:22.000000000 +0200
3 +++ gdm-2.15.9/configure.ac 2006-08-09 22:21:36.737065346 +0200
8 -# First check with "! -h" for /usr/X11R6 and /usr/X11 since they often
9 -# symlink to each other, and configure should use the more stable
10 -# location (the real directory) if possible.
12 -if 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 - GDM_USER_PATH="$GDM_USER_PATH:/usr/X11R6/bin"
17 - X_CONFIG_OPTIONS="-audit 0"
18 -elif test ! -h /usr/X11 -a -x /usr/X11/bin/X; then
19 - X_PATH="/usr/X11/bin"
20 - X_SERVER_PATH="/usr/X11/bin"
21 - X_SERVER="/usr/X11/bin/X"
22 - GDM_USER_PATH="$GDM_USER_PATH:/usr/X11/bin"
23 - X_CONFIG_OPTIONS="-audit 0"
24 -elif test -x /usr/X11R6/bin/X; then
25 - X_PATH="/usr/X11R6/bin"
26 - X_SERVER_PATH="/usr/X11R6/bin"
27 - X_SERVER="/usr/X11R6/bin/X"
28 - GDM_USER_PATH="$GDM_USER_PATH:/usr/X11R6/bin"
29 - X_CONFIG_OPTIONS="-audit 0"
30 -elif test -x /usr/bin/Xorg; then
32 - X_SERVER_PATH="/usr/bin"
33 - X_SERVER="/usr/bin/Xorg"
34 - X_CONFIG_OPTIONS="-audit 0"
35 -elif test -x /usr/X11/bin/X; then
36 - X_PATH="/usr/X11/bin"
37 - X_SERVER_PATH="/usr/X11/bin"
38 - X_SERVER="/usr/X11/bin/X"
39 - GDM_USER_PATH="$GDM_USER_PATH:/usr/X11/bin"
40 - X_CONFIG_OPTIONS="-audit 0"
41 -elif test -x /usr/openwin/bin/Xsun; then
42 - # Do not add /usr/openwin/bin here because on Solaris you need
43 - # /usr/openwin/bin in your PATH even if you are using the Xorg
44 - # Xserver. We add this to the path below.
45 - X_PATH="/usr/openwin/bin"
46 - X_SERVER_PATH="/usr/openwin/bin"
47 - X_SERVER="/usr/openwin/bin/Xsun"
48 - X_CONFIG_OPTIONS="-audit 0 -nobanner"
49 -elif test -x /opt/X11R6/bin/X; then
50 - X_PATH="/opt/X11R6/bin"
51 - X_SERVER_PATH="/opt/X11R6/bin"
52 - X_SERVER="/opt/X11R6/bin/X"
53 - GDM_USER_PATH="$GDM_USER_PATH:/opt/X11R6/bin"
54 - X_CONFIG_OPTIONS="-audit 0"
55 -elif test -x /usr/bin/X; then
57 - X_SERVER_PATH="/usr/bin"
58 - X_SERVER="/usr/bin/X"
59 - X_CONFIG_OPTIONS="-audit 0"
61 - # what to do, what to do, this is wrong, but this just sets the
62 - # defaults, perhaps this user is cross compiling or some such
63 - X_PATH="/usr/bin/X11:/usr/X11R6/bin:/opt/X11R6/bin"
64 - X_SERVER_PATH="/usr/X11R6/bin"
65 - X_SERVER="/usr/X11R6/bin/X"
66 - GDM_USER_PATH="$GDM_USER_PATH:/usr/bin/X11:/usr/X11R6/bin:/usr/local/bin:/opt/X11R6/bin"
67 - X_CONFIG_OPTIONS="-audit 0"
70 +X_SERVER_PATH="/usr/bin"
71 +X_SERVER="/usr/bin/X"
72 +X_CONFIG_OPTIONS="-audit 0"
74 # Don't add bindir to GDM_USER_PATH if it is already in the PATH.
75 # If it is /bin or /usr/bin, for example.