diff options
| author |   Koen Kooi <koen@dominion.thruhere.net> | 2011-06-08 17:56:00 +0200 |
|---|---|---|
| committer | Koen Kooi <koen@dominion.thruhere.net> | 2011-06-08 17:56:00 +0200 |
| commit | f5b2fa5ea2d80e971fa5ca25b33771a503a0a54a (patch) | |
| tree | a0f7927d3adcfd4d78c877e84ae554757a177c84 /meta-gnome/recipes-gnome/gdm/gdm-2.30.0/cross-xdetection.diff | |
| parent | 9f2c190edefe923afe664e5fc86de5f9ed9486c6 (diff) | |
| download | meta-openembedded-f5b2fa5ea2d80e971fa5ca25b33771a503a0a54a.tar.gz | |
gdm 2.30.0: import from OE rev d4f0211e2078d5033ae0dee74664de5520d8392d
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-gnome/recipes-gnome/gdm/gdm-2.30.0/cross-xdetection.diff')
| -rw-r--r-- | meta-gnome/recipes-gnome/gdm/gdm-2.30.0/cross-xdetection.diff | 66 |
1 files changed, 66 insertions, 0 deletions
diff --git a/meta-gnome/recipes-gnome/gdm/gdm-2.30.0/cross-xdetection.diff b/meta-gnome/recipes-gnome/gdm/gdm-2.30.0/cross-xdetection.diff new file mode 100644 index 0000000000..150f79763a --- /dev/null +++ b/meta-gnome/recipes-gnome/gdm/gdm-2.30.0/cross-xdetection.diff @@ -0,0 +1,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 |