summaryrefslogtreecommitdiff
path: root/recipes/gnome/gdm/cross-xdetection.diff
diff options
context:
space:
mode:
authorDenys Dmytriyenko <denis@denix.org>2009-03-17 14:32:59 -0400
committerDenys Dmytriyenko <denis@denix.org>2009-03-17 14:32:59 -0400
commit709c4d66e0b107ca606941b988bad717c0b45d9b (patch)
tree37ee08b1eb308f3b2b6426d5793545c38396b838 /recipes/gnome/gdm/cross-xdetection.diff
parentfa6cd5a3b993f16c27de4ff82b42684516d433ba (diff)
rename packages/ to recipes/ per earlier agreement
See links below for more details: http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326 http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816 Signed-off-by: Denys Dmytriyenko <denis@denix.org> Acked-by: Mike Westerhof <mwester@dls.net> Acked-by: Philip Balister <philip@balister.org> Acked-by: Khem Raj <raj.khem@gmail.com> Acked-by: Marcin Juszkiewicz <hrw@openembedded.org> Acked-by: Koen Kooi <koen@openembedded.org> Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
Diffstat (limited to 'recipes/gnome/gdm/cross-xdetection.diff')
-rw-r--r--recipes/gnome/gdm/cross-xdetection.diff84
1 files changed, 84 insertions, 0 deletions
diff --git a/recipes/gnome/gdm/cross-xdetection.diff b/recipes/gnome/gdm/cross-xdetection.diff
new file mode 100644
index 0000000000..9cb6ac98dd
--- /dev/null
+++ b/recipes/gnome/gdm/cross-xdetection.diff
@@ -0,0 +1,84 @@
+--- /tmp/configure.ac 2008-12-10 08:38:16.000000000 +0100
++++ gdm-2.24.1/configure.ac 2008-12-10 08:39:17.000000000 +0100
+@@ -1133,80 +1133,10 @@
+ dnl - Check for X Server location
+ dnl ---------------------------------------------------------------------------
+
+-# First check with "! -h" for /usr/X11R6 and /usr/X11 since they often
+-# symlink to each other, and configure should use the more stable
+-# location (the real directory) if possible.
+-#
+-# On Solaris, the /usr/bin/Xserver script is used to decide whether to
+-# use Xsun or Xorg, so this is used on Solaris.
+-#
+-# When testing for /usr/X11R6, first check with "! -h" for /usr/X11R6
+-# 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"
+- GDM_USER_PATH="$GDM_USER_PATH:/usr/X11/bin"
+- 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"
+- 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
+- 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"
+- 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"
+- GDM_USER_PATH="$GDM_USER_PATH:/usr/X11/bin"
+- 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"
+- GDM_USER_PATH="$GDM_USER_PATH:/opt/X11R6/bin"
+- 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_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"
+- GDM_USER_PATH="$GDM_USER_PATH:/usr/bin/X11:/usr/X11R6/bin:/usr/local/bin:/opt/X11R6/bin"
++ X_SERVER="/etc/X11/Xserver"
+ X_CONFIG_OPTIONS="-audit 0"
+-fi
+
+ # Don't add bindir to GDM_USER_PATH if it is already in the PATH.
+ # If it is /bin or /usr/bin, for example.