diff options
author | Brian Cameron <brian.cameron@sun.com> | 2007-04-11 08:30:06 +0000 |
---|---|---|
committer | Brian Cameron <bcameron@src.gnome.org> | 2007-04-11 08:30:06 +0000 |
commit | 74a4422329d2fd7c74c24a2fa5b6ae8427614e40 (patch) | |
tree | 37502a5d04a13efa1f3b644fc4c83a8dee1417f9 | |
parent | fddff5097ac5a94ecac7de21b61489c90238c58c (diff) | |
download | gdm-74a4422329d2fd7c74c24a2fa5b6ae8427614e40.tar.gz |
Minor change to ensure that XnestUnscaledFontPath is always set even if no
2007-04-11 Brian Cameron <brian.cameron@sun.com>
* configure.ac: Minor change to ensure that XnestUnscaledFontPath
is always set even if no Xnest command is found.
svn path=/trunk/; revision=4825
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | configure.ac | 4 |
2 files changed, 7 insertions, 2 deletions
@@ -1,3 +1,8 @@ +2007-04-11 Brian Cameron <brian.cameron@sun.com> + + * configure.ac: Minor change to ensure that XnestUnscaledFontPath + is always set even if no Xnest command is found. + 2007-04-10 William Jon McCann <mccann@jhu.edu> * common/gdm-config.c: (gdm_config_value_get_string_array): diff --git a/configure.ac b/configure.ac index d7c35f16..d94b84f3 100644 --- a/configure.ac +++ b/configure.ac @@ -1082,13 +1082,14 @@ if test "x$real_gdm_prefix" != "x/" -a "x$real_gdm_prefix" != "x/usr"; then GDM_USER_PATH="$GDM_USER_PATH:${bindir}" fi + # Use Xephyr if it is available. It works better than Xnest since Xephyr # supports the Xserver extensions, even if on a remote machine. # +X_XNEST_UNSCALED_FONTPATH="true" if test -x $X_SERVER_PATH/Xephyr; then X_XNEST_CMD="$X_SERVER_PATH/Xephyr" X_XNEST_CONFIG_OPTIONS="-audit 0" - X_XNEST_UNSCALED_FONTPATH="true" else if test -x /usr/openwin/bin/Xnest; then # If on Solaris, Xnest is only shipped with the Xsun Xserver, so @@ -1101,7 +1102,6 @@ else if test -x $X_SERVER_PATH/Xnest; then X_XNEST_CMD="$X_SERVER_PATH/Xnest" X_XNEST_CONFIG_OPTIONS="-audit 0 -name Xnest" - X_XNEST_UNSCALED_FONTPATH="true" fi fi fi |