|
 |
0b53c7 |
From 56e545ff4c87685f50ee9c77e0faab0c44b4ee3c Mon Sep 17 00:00:00 2001
|
|
|
0b53c7 |
From: Ray Strode <rstrode@redhat.com>
|
|
|
0b53c7 |
Date: Mon, 3 Dec 2018 13:58:47 -0500
|
|
|
0b53c7 |
Subject: [PATCH] configure: don't assume x server defaults to local only
|
|
|
0b53c7 |
|
|
|
0b53c7 |
it doesn't in rhel.
|
|
|
0b53c7 |
---
|
|
|
0b53c7 |
configure.ac | 8 --------
|
|
|
0b53c7 |
1 file changed, 8 deletions(-)
|
|
|
0b53c7 |
|
|
|
0b53c7 |
diff --git a/configure.ac b/configure.ac
|
|
|
0b53c7 |
index 7ad55df84..4ed53027f 100644
|
|
|
0b53c7 |
--- a/configure.ac
|
|
|
0b53c7 |
+++ b/configure.ac
|
|
|
0b53c7 |
@@ -1243,68 +1243,60 @@ elif test -x /usr/X11R6/bin/X; then
|
|
|
0b53c7 |
X_PATH="/usr/X11R6/bin"
|
|
|
0b53c7 |
X_SERVER_PATH="/usr/X11R6/bin"
|
|
|
0b53c7 |
X_SERVER="/usr/X11R6/bin/X"
|
|
|
0b53c7 |
elif test -x /usr/bin/Xorg; then
|
|
|
0b53c7 |
X_PATH="/usr/bin"
|
|
|
0b53c7 |
X_SERVER_PATH="/usr/bin"
|
|
|
0b53c7 |
X_SERVER="/usr/bin/Xorg"
|
|
|
0b53c7 |
elif test -x /usr/X11/bin/X; then
|
|
|
0b53c7 |
X_PATH="/usr/X11/bin"
|
|
|
0b53c7 |
X_SERVER_PATH="/usr/X11/bin"
|
|
|
0b53c7 |
X_SERVER="/usr/X11/bin/X"
|
|
|
0b53c7 |
elif test -x /usr/openwin/bin/Xsun; then
|
|
|
0b53c7 |
# Do not add /usr/openwin/bin here because on Solaris you need
|
|
|
0b53c7 |
# /usr/openwin/bin in your PATH even if you are using the Xorg
|
|
|
0b53c7 |
# Xserver. We add this to the path below.
|
|
|
0b53c7 |
X_PATH="/usr/openwin/bin"
|
|
|
0b53c7 |
X_SERVER_PATH="/usr/openwin/bin"
|
|
|
0b53c7 |
X_SERVER="/usr/openwin/bin/Xsun"
|
|
|
0b53c7 |
elif test -x /opt/X11R6/bin/X; then
|
|
|
0b53c7 |
X_PATH="/opt/X11R6/bin"
|
|
|
0b53c7 |
X_SERVER_PATH="/opt/X11R6/bin"
|
|
|
0b53c7 |
X_SERVER="/opt/X11R6/bin/X"
|
|
|
0b53c7 |
else
|
|
|
0b53c7 |
# what to do, what to do, this is wrong, but this just sets the
|
|
|
0b53c7 |
# defaults, perhaps this user is cross compiling or some such
|
|
|
0b53c7 |
X_PATH="/usr/bin/X11:/usr/X11R6/bin:/opt/X11R6/bin"
|
|
|
0b53c7 |
X_SERVER_PATH="/usr/bin"
|
|
|
0b53c7 |
X_SERVER="/usr/bin/X"
|
|
|
0b53c7 |
fi
|
|
|
0b53c7 |
|
|
|
0b53c7 |
-dnl ---------------------------------------------------------------------------
|
|
|
0b53c7 |
-dnl - Check if Xorg is new enough to require '-listen tcp' (1.17)
|
|
|
0b53c7 |
-dnl ---------------------------------------------------------------------------
|
|
|
0b53c7 |
-
|
|
|
0b53c7 |
-if $PKG_CONFIG --atleast-version=1.17 xorg-server; then
|
|
|
0b53c7 |
- AC_DEFINE([HAVE_XSERVER_THAT_DEFAULTS_TO_LOCAL_ONLY], [], [XServer disables tcp access by default])
|
|
|
0b53c7 |
-fi
|
|
|
0b53c7 |
-
|
|
|
0b53c7 |
dnl ---------------------------------------------------------------------------
|
|
|
0b53c7 |
dnl - Expand vars
|
|
|
0b53c7 |
dnl ---------------------------------------------------------------------------
|
|
|
0b53c7 |
|
|
|
0b53c7 |
AS_AC_EXPAND(LOCALSTATEDIR, $localstatedir)
|
|
|
0b53c7 |
AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)
|
|
|
0b53c7 |
AS_AC_EXPAND(DATADIR, $datadir)
|
|
|
0b53c7 |
AS_AC_EXPAND(BINDIR, $bindir)
|
|
|
0b53c7 |
AS_AC_EXPAND(SBINDIR, $sbindir)
|
|
|
0b53c7 |
AS_AC_EXPAND(LIBDIR, $libdir)
|
|
|
0b53c7 |
AS_AC_EXPAND(LIBEXECDIR, $libexecdir)
|
|
|
0b53c7 |
|
|
|
0b53c7 |
dnl ---------------------------------------------------------------------------
|
|
|
0b53c7 |
dnl - runtime directory
|
|
|
0b53c7 |
dnl ---------------------------------------------------------------------------
|
|
|
0b53c7 |
|
|
|
0b53c7 |
AC_ARG_WITH([run-dir],
|
|
|
0b53c7 |
AS_HELP_STRING([--with-run-dir=<file>],
|
|
|
0b53c7 |
[runtime directory]))
|
|
|
0b53c7 |
|
|
|
0b53c7 |
if ! test -z "$with_run_dir"; then
|
|
|
0b53c7 |
GDM_RUN_DIR=$with_run_dir
|
|
|
0b53c7 |
else
|
|
|
0b53c7 |
GDM_RUN_DIR=${localstatedir}/run/gdm
|
|
|
0b53c7 |
fi
|
|
|
0b53c7 |
|
|
|
0b53c7 |
AC_SUBST([GDM_RUN_DIR])
|
|
|
0b53c7 |
|
|
|
0b53c7 |
dnl ---------------------------------------------------------------------------
|
|
|
0b53c7 |
dnl - PID file
|
|
|
0b53c7 |
--
|
|
|
0b53c7 |
2.17.1
|
|
|
0b53c7 |
|