Commit ce2ef875 authored by Laurent Bigonville's avatar Laurent Bigonville Committed by Ray Strode

Remove obsolete references to XNEST from the build system

https://bugzilla.gnome.org/show_bug.cgi?id=764567
parent f15e6451
......@@ -39,9 +39,6 @@
#undef HAVE_XINPUT
#undef X_SERVER
#undef X_SERVER_PATH
#undef X_XNEST_CMD
#undef X_XNEST_CONFIG_OPTIONS
#undef X_XNEST_UNSCALED_FONTPATH
#undef X_CONFIG_OPTIONS
#undef X_PATH
#undef XSESSION_SHELL
......
......@@ -350,7 +350,6 @@ AC_CHECK_HEADERS(sys/vt.h)
EXTRA_DAEMON_LIBS=""
EXTRA_CHOOSER_LIBS=""
EXTRA_XNEST_LIBS=""
EXTRA_FLEXI_LIBS=""
EXTRA_DYNAMIC_LIBS=""
EXTRA_SETUP_LIBS=""
......@@ -360,7 +359,6 @@ AC_CHECK_FUNC(socket,,[
AC_CHECK_LIB(socket,socket, [
EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lsocket"
EXTRA_CHOOSER_LIBS="$EXTRA_CHOOSER_LIBS -lsocket"
EXTRA_XNEST_LIBS="$EXTRA_XNEST_LIBS -lsocket"
EXTRA_FLEXI_LIBS="$EXTRA_FLEXI_LIBS -lsocket"
EXTRA_DYNAMIC_LIBS="$EXTRA_DYNAMIC_LIBS -lsocket"
EXTRA_SETUP_LIBS="$EXTRA_SETUP_LIBS -lsocket"
......@@ -1199,7 +1197,6 @@ fi
#
AC_SUBST(EXTRA_DAEMON_LIBS)
AC_SUBST(EXTRA_CHOOSER_LIBS)
AC_SUBST(EXTRA_XNEST_LIBS)
AC_SUBST(EXTRA_FLEXI_LIBS)
AC_SUBST(EXTRA_DYNAMIC_LIBS)
AC_SUBST(EXTRA_SETUP_LIBS)
......@@ -1281,33 +1278,6 @@ if $PKG_CONFIG --atleast-version=1.17 xorg-server; then
AC_DEFINE([HAVE_XSERVER_THAT_DEFAULTS_TO_LOCAL_ONLY], [], [XServer disables tcp access by default])
fi
dnl ---------------------------------------------------------------------------
dnl - Check for Xnest / Xephyr support
dnl ---------------------------------------------------------------------------
# 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"
else
if test -x /usr/openwin/bin/Xnest; then
# If on Solaris, Xnest is only shipped with the Xsun Xserver, so
# use this version.
#
X_XNEST_CMD="/usr/openwin/bin/Xnest"
X_XNEST_CONFIG_OPTIONS="-audit 0 -name Xnest -pn"
X_XNEST_UNSCALED_FONTPATH="false"
else
if test -x $X_SERVER_PATH/Xnest; then
X_XNEST_CMD="$X_SERVER_PATH/Xnest"
X_XNEST_CONFIG_OPTIONS="-audit 0 -name Xnest"
fi
fi
fi
dnl ---------------------------------------------------------------------------
dnl - Expand vars
dnl ---------------------------------------------------------------------------
......@@ -1554,13 +1524,6 @@ AC_SUBST(X_SERVER_PATH)
AC_DEFINE_UNQUOTED(X_SERVER,"$X_SERVER",[])
AC_DEFINE_UNQUOTED(X_SERVER_PATH,"$X_SERVER_PATH",[])
AC_SUBST(X_XNEST_CMD)
AC_SUBST(X_XNEST_CONFIG_OPTIONS)
AC_SUBST(X_XNEST_UNSCALED_FONTPATH)
AC_DEFINE_UNQUOTED(X_XNEST_CMD,"$X_XNEST_CMD",[])
AC_DEFINE_UNQUOTED(X_XNEST_CONFIG_OPTIONS,"$X_XNEST_CONFIG_OPTIONS",[])
AC_DEFINE_UNQUOTED(X_XNEST_UNSCALED_FONTPATH,"$X_XNEST_UNSCALED_FONTPATH",[])
## Stuff for debian/changelog.in
#if test -e "debian/changelog"; then
# DEBIAN_DATESTAMP=`head -1 debian/changelog| sed -e 's/.*cvs.//' -e 's/).*//'`
......
......@@ -72,9 +72,6 @@ gdm.schemas.in: $(srcdir)/gdm.schemas.in.in
-e 's,[@]ALWAYS_RESTART_SERVER[@],$(ALWAYS_RESTART_SERVER),g' \
-e 's,[@]X_CONFIG_OPTIONS[@],$(X_CONFIG_OPTIONS),g' \
-e 's,[@]X_SERVER[@],$(X_SERVER),g' \
-e 's,[@]X_XNEST_CMD[@],$(X_XNEST_CMD),g' \
-e 's,[@]X_XNEST_CONFIG_OPTIONS[@],$(X_XNEST_CONFIG_OPTIONS),g' \
-e 's,[@]X_XNEST_UNSCALED_FONTPATH[@],$(X_XNEST_UNSCALED_FONTPATH),g' \
-e 's,[@]GDM_RBAC_SYSCMD_KEYS[@],$(GDM_RBAC_SYSCMD_KEYS),g' \
-e 's,[@]datadir[@],$(datadir),g' \
-e 's,[@]gdmconfdir[@],$(gdmconfdir),g' \
......
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