Commit 9432c999 authored by William Jon McCann's avatar William Jon McCann Committed by William Jon McCann

Use X_SERVER define instead of hardcoding xorg.

2007-08-31  William Jon McCann  <mccann@jhu.edu>

	* configure.ac:
	* daemon/gdm-server.c: (gdm_server_init):
	Use X_SERVER define instead of hardcoding xorg.


svn path=/branches/mccann-gobject/; revision=5209
parent afeae4b7
2007-08-31 William Jon McCann <mccann@jhu.edu>
* configure.ac:
* daemon/gdm-server.c: (gdm_server_init):
Use X_SERVER define instead of hardcoding xorg.
Patch from Brian Cameron <brian.cameron@sun.com>
2007-08-30 William Jon McCann <mccann@jhu.edu>
* configure.ac:
......
......@@ -1068,7 +1068,20 @@ AC_SUBST(EXTRA_GREETER_LIBS)
# symlink to each other, and configure should use the more stable
# location (the real directory) if possible.
#
if test ! -h /usr/X11R6 -a -x /usr/X11R6/bin/X; then
# 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"
......
......@@ -895,7 +895,7 @@ gdm_server_init (GdmServer *server)
server->priv = GDM_SERVER_GET_PRIVATE (server);
server->priv->pid = -1;
server->priv->command = g_strdup ("/usr/bin/Xorg -br -verbose");
server->priv->command = g_strdup (X_SERVER " -br -verbose");
server->priv->log_dir = g_strdup (LOGDIR);
setup_ready_signal (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