diff options
| author | Laurent Bigonville <bigon@bigon.be> | 2016-04-04 03:39:25 +0200 |
|---|---|---|
| committer | Ray Strode <rstrode@redhat.com> | 2018-02-12 10:07:12 -0500 |
| commit | ce2ef875cae926ea7d07ca55eef802d9a6c4e033 (patch) | |
| tree | 043b98fac5992cd6cedb87acb6e37aa41db1e939 /configure.ac | |
| parent | f15e6451a04c1aa16f6dd10ed6185eebac3e82f7 (diff) | |
| download | gdm-ce2ef875cae926ea7d07ca55eef802d9a6c4e033.tar.gz | |
Remove obsolete references to XNEST from the build system
https://bugzilla.gnome.org/show_bug.cgi?id=764567
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/configure.ac b/configure.ac index c02626bc..434cadee 100644 --- a/configure.ac +++ b/configure.ac @@ -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) @@ -1282,33 +1279,6 @@ if $PKG_CONFIG --atleast-version=1.17 xorg-server; then 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/).*//'` |