aboutsummaryrefslogtreecommitdiffstats
path: root/meta-gnome/recipes-gnome/gdm/gdm-2.30.0/cross-xdetection.diff
diff options
context:
space:
mode:
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.diff66
1 files changed, 0 insertions, 66 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
deleted file mode 100644
index 150f79763a..0000000000
--- a/meta-gnome/recipes-gnome/gdm/gdm-2.30.0/cross-xdetection.diff
+++ /dev/null
@@ -1,66 +0,0 @@
---- 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