| Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame^] | 1 | From 60084e7e973634971c9643f2459e5d3e248ee3f1 Mon Sep 17 00:00:00 2001 |
| 2 | From: Koen Kooi <koen@dominion.thruhere.net> |
| 3 | Date: Thu, 9 Jun 2011 18:12:45 +0200 |
| 4 | Subject: [PATCH] build-sys: hardcode x paths to fix crosscompiling |
| 5 | |
| 6 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> |
| 7 | --- |
| 8 | configure.ac | 72 ++++----------------------------------------------------- |
| 9 | 1 files changed, 5 insertions(+), 67 deletions(-) |
| 10 | |
| 11 | diff --git a/configure.ac b/configure.ac |
| 12 | index eeaf3dc..841efe0 100644 |
| 13 | --- a/configure.ac |
| 14 | +++ b/configure.ac |
| 15 | @@ -1101,73 +1101,11 @@ dnl --------------------------------------------------------------------------- |
| 16 | dnl - Check for X Server location |
| 17 | dnl --------------------------------------------------------------------------- |
| 18 | |
| 19 | -# First check with "! -h" for /usr/X11R6 and /usr/X11 since they often |
| 20 | -# symlink to each other, and configure should use the more stable |
| 21 | -# location (the real directory) if possible. |
| 22 | -# |
| 23 | -# On Solaris, the /usr/bin/Xserver script is used to decide whether to |
| 24 | -# use Xsun or Xorg, so this is used on Solaris. |
| 25 | -# |
| 26 | -# When testing for /usr/X11R6, first check with "! -h" for /usr/X11R6 |
| 27 | -# and /usr/X11 since they often symlink to each other, and configure |
| 28 | -# should use the more stable location (the real directory) if possible. |
| 29 | -# |
| 30 | -if test -x /usr/X11/bin/Xserver; then |
| 31 | - X_PATH="/usr/X11/bin" |
| 32 | - X_SERVER_PATH="/usr/X11/bin" |
| 33 | - X_SERVER="/usr/X11/bin/Xserver" |
| 34 | - X_CONFIG_OPTIONS="-audit 0" |
| 35 | -elif test ! -h /usr/X11R6 -a -x /usr/X11R6/bin/X; then |
| 36 | - X_PATH="/usr/X11R6/bin" |
| 37 | - X_SERVER_PATH="/usr/X11R6/bin" |
| 38 | - X_SERVER="/usr/X11R6/bin/X" |
| 39 | - X_CONFIG_OPTIONS="-audit 0" |
| 40 | -elif test ! -h /usr/X11 -a -x /usr/X11/bin/X; then |
| 41 | - X_PATH="/usr/X11/bin" |
| 42 | - X_SERVER_PATH="/usr/X11/bin" |
| 43 | - X_SERVER="/usr/X11/bin/X" |
| 44 | - X_CONFIG_OPTIONS="-audit 0" |
| 45 | -elif test -x /usr/X11R6/bin/X; then |
| 46 | - X_PATH="/usr/X11R6/bin" |
| 47 | - X_SERVER_PATH="/usr/X11R6/bin" |
| 48 | - X_SERVER="/usr/X11R6/bin/X" |
| 49 | - X_CONFIG_OPTIONS="-audit 0" |
| 50 | -elif test -x /usr/bin/Xorg; then |
| 51 | - X_PATH="/usr/bin" |
| 52 | - X_SERVER_PATH="/usr/bin" |
| 53 | - X_SERVER="/usr/bin/Xorg" |
| 54 | - X_CONFIG_OPTIONS="-audit 0" |
| 55 | -elif test -x /usr/X11/bin/X; then |
| 56 | - X_PATH="/usr/X11/bin" |
| 57 | - X_SERVER_PATH="/usr/X11/bin" |
| 58 | - X_SERVER="/usr/X11/bin/X" |
| 59 | - X_CONFIG_OPTIONS="-audit 0" |
| 60 | -elif test -x /usr/openwin/bin/Xsun; then |
| 61 | - # Do not add /usr/openwin/bin here because on Solaris you need |
| 62 | - # /usr/openwin/bin in your PATH even if you are using the Xorg |
| 63 | - # Xserver. We add this to the path below. |
| 64 | - X_PATH="/usr/openwin/bin" |
| 65 | - X_SERVER_PATH="/usr/openwin/bin" |
| 66 | - X_SERVER="/usr/openwin/bin/Xsun" |
| 67 | - X_CONFIG_OPTIONS="-audit 0 -nobanner" |
| 68 | -elif test -x /opt/X11R6/bin/X; then |
| 69 | - X_PATH="/opt/X11R6/bin" |
| 70 | - X_SERVER_PATH="/opt/X11R6/bin" |
| 71 | - X_SERVER="/opt/X11R6/bin/X" |
| 72 | - X_CONFIG_OPTIONS="-audit 0" |
| 73 | -elif test -x /usr/bin/X; then |
| 74 | - X_PATH="/usr/bin" |
| 75 | - X_SERVER_PATH="/usr/bin" |
| 76 | - X_SERVER="/usr/bin/X" |
| 77 | - X_CONFIG_OPTIONS="-audit 0" |
| 78 | -else |
| 79 | - # what to do, what to do, this is wrong, but this just sets the |
| 80 | - # defaults, perhaps this user is cross compiling or some such |
| 81 | - X_PATH="/usr/bin/X11:/usr/X11R6/bin:/opt/X11R6/bin" |
| 82 | - X_SERVER_PATH="/usr/bin" |
| 83 | - X_SERVER="/usr/bin/X" |
| 84 | - X_CONFIG_OPTIONS="-audit 0" |
| 85 | -fi |
| 86 | +# We hardcode the X paths since we know where it will be in the OE univers |
| 87 | +X_PATH="/usr/bin" |
| 88 | +X_SERVER_PATH="/usr/bin" |
| 89 | +X_SERVER="/usr/bin/X" |
| 90 | +X_CONFIG_OPTIONS="-audit 0" |
| 91 | |
| 92 | dnl --------------------------------------------------------------------------- |
| 93 | dnl - Check for Xnest / Xephyr support |
| 94 | -- |
| 95 | 1.6.6.1 |
| 96 | |