From: Josselin Mouette <joss@debian.org>
Date: Fri, 7 May 2010 21:42:02 +0200
Subject: Use X_PATH and related environment variables when they exist

Based on a patch by Julien Cristau.

Origin: vendor, Debian
Forwarded: no
---
 build-aux/find-x-server.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/build-aux/find-x-server.sh b/build-aux/find-x-server.sh
index b5a8075..f48557e 100755
--- a/build-aux/find-x-server.sh
+++ b/build-aux/find-x-server.sh
@@ -11,7 +11,11 @@
 # 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/bin/X; then
+
+if test -n "$X_BIN"; then
+    # assume the user set these variables and don't second-guess them.
+    echo "$X_BIN"
+elif test -x /usr/bin/X; then
     echo "/usr/bin/X"
 elif test -x /usr/X11/bin/Xserver; then
     echo "/usr/X11/bin/Xserver"