diff options
| author | Brian Cameron <brian.cameron@sun.com> | 2007-05-09 04:33:28 +0000 |
|---|---|---|
| committer | Brian Cameron <bcameron@src.gnome.org> | 2007-05-09 04:33:28 +0000 |
| commit | 848c91755b5f06313156b2b4e3c3195c5d069d1a (patch) | |
| tree | ee6ff32c877341d40876748cd201dc8abe50f8eb | |
| parent | 6f408c8d9a19e69c194f368b932475634abe44b5 (diff) | |
| download | gdm-848c91755b5f06313156b2b4e3c3195c5d069d1a.tar.gz | |
Fix check for Xserver to work for Debian and Ubuntu. Fixes bug #436879.
2007-05-09 Brian Cameron <brian.cameron@sun.com>
* configure.ac: Fix check for Xserver to work for Debian
and Ubuntu. Fixes bug #436879. Patch by Lo\357c Minier
<lool+gnome@via.ecp.fr>
svn path=/trunk/; revision=4904
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | configure.ac | 19 |
2 files changed, 19 insertions, 7 deletions
@@ -1,9 +1,16 @@ 2007-05-09 Brian Cameron <brian.cameron@sun.com> + * configure.ac: Fix check for Xserver to work for Debian + and Ubuntu. Fixes bug #436879. Patch by Lo\357c Minier + <lool+gnome@via.ecp.fr> + +2007-05-09 Brian Cameron <brian.cameron@sun.com> + * daemon/misc.c: In gdm_fdgetc must used an unsigned char buffer here because the GUI sends username/password data as utf8 and the daemon will interpret any character sent with its high bit set as EOF unless we used unsigned here. + Patch by Lo\357c Minier <lool+gnome@via.ecp.fr> 2007-05-09 Brian Cameron <brian.cameron@sun.com> diff --git a/configure.ac b/configure.ac index 11186a22..798f64a6 100644 --- a/configure.ac +++ b/configure.ac @@ -1038,29 +1038,34 @@ esac # symlink to each other, and configure should use the more stable # location (the real directory) if possible. # -if test ! -h /usr/X11R6 -a -x /usr/X11R6/bin/X; then +if test ! -h /usr/X11R6 -a ! -h /usr/X11R6/bin -a -x /usr/X11R6/bin/X; then X_PATH="/usr/X11R6/bin" X_SERVER_PATH="/usr/X11R6/bin" X_SERVER="/usr/X11R6/bin/X" GDM_USER_PATH="$GDM_USER_PATH:/usr/X11R6/bin" X_CONFIG_OPTIONS="-audit 0" -elif test ! -h /usr/X11 -a -x /usr/X11/bin/X; then +elif test ! -h /usr/X11 -a ! -h /usr/X11/bin -a -x /usr/X11/bin/X; then X_PATH="/usr/X11/bin" X_SERVER_PATH="/usr/X11/bin" X_SERVER="/usr/X11/bin/X" GDM_USER_PATH="$GDM_USER_PATH:/usr/X11/bin" 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" - GDM_USER_PATH="$GDM_USER_PATH:/usr/X11R6/bin" +elif test -x /usr/bin/X; then + X_PATH="/usr/bin" + X_SERVER_PATH="/usr/bin" + X_SERVER="/usr/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/X11R6/bin/X; then + X_PATH="/usr/X11R6/bin" + X_SERVER_PATH="/usr/X11R6/bin" + X_SERVER="/usr/X11R6/bin/X" + GDM_USER_PATH="$GDM_USER_PATH:/usr/X11R6/bin" + X_CONFIG_OPTIONS="-audit 0" elif test -x /usr/X11/bin/X; then X_PATH="/usr/X11/bin" X_SERVER_PATH="/usr/X11/bin" |