Commit 948aca20 authored by Brian Cameron's avatar Brian Cameron Committed by Brian Cameron

Set up Xnest so it works properly on Solaris.

2004-10-21  Brian Cameron  <brian.cameron@sun.com>

    * acconfig.h, configure.in, config/gdm.conf.in: Set up Xnest
      so it works properly on Solaris.
parent 143db2ce
2004-10-21 Brian Cameron <brian.cameron@sun.com>
* acconfig.h, configure.in, config/gdm.conf.in: Set up Xnest
so it works properly on Solaris.
2004-10-14 Brian Cameron <brian.cameron@sun.com>
* config/gdm.conf.in: Minor change to wording in comments.
......
......@@ -32,9 +32,13 @@
#undef EXPANDED_LOGDIR
#undef EXPANDED_SYSCONFDIR
#undef EXPANDED_SESSDIR
#undef X_PATH
#undef X_SERVER
#undef X_SERVER_PATH
#undef X_XNEST_PATH
#undef X_XNEST_CONFIG_OPTIONS
#undef X_CONF_PATH
#undef X_CONFIG_OPTIONS
#undef GETTEXT_PACKAGE
#undef HAVE_LOGINCAP
#undef HAVE_SYS_SOCKIO_H
......
......@@ -130,7 +130,7 @@ StandardXServer=@X_SERVER@
# Does not affect Xnest flexiservers.
#FlexiReapDelayMinutes=5
# the X nest command
Xnest=@X_SERVER_PATH@/Xnest -audit 0 -name Xnest
Xnest=@X_XNEST_PATH@/Xnest @X_XNEST_CONFIG_OPTIONS@
# Automatic VT allocation. Right now only works on Linux. This way
# we force X to use specific vts. turn VTAllocation to false if this
# is causing problems.
......
......@@ -691,9 +691,30 @@ else
X_CONF_PATH="/usr/bin/X11:/usr/X11R6/bin:/usr/local/bin:/opt/X11R6/bin"
X_CONFIG_OPTIONS="-audit 0"
fi
# On Solaris, Xnest is only shipped in /usr/openwin/, so set path
# properly. The Xsun version of Xnest also requires the -pn
# argument so it can be run as the user. Note that you can have
# both the X.org and Xsun Xservers on the same system (but X.org on
# Solaris doesn't ship with Xnest), so this makes Solaris work
# properly when the X.org Xserver is included.
#
case "$host" in
*solaris*)
X_XNEST_PATH="/usr/openwin/bin"
X_XNEST_CONFIG_OPTIONS="-audit 0 -name Xnest -pn"
;;
*)
X_XNEST_PATH=$X_SERVER_PATH
X_XNEST_CONFIG_OPTIONS="-audit 0 -name Xnest"
;;
esac
AC_SUBST(X_PATH)
AC_SUBST(X_SERVER)
AC_SUBST(X_SERVER_PATH)
AC_SUBST(X_XNEST_PATH)
AC_SUBST(X_XNEST_CONFIG_OPTIONS)
AC_SUBST(X_CONF_PATH)
AC_SUBST(X_CONFIG_OPTIONS)
AC_DEFINE_UNQUOTED(X_SERVER,"$X_SERVER")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment