diff options
| author | Adam Jackson <ajax@nwnk.net> | 2006-04-02 00:46:20 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@nwnk.net> | 2006-04-02 00:46:20 +0000 |
| commit | 323fec20292fc5ad90bfee9015ecccdc13c968ad (patch) | |
| tree | 12d3112b4c17298af5e26960e70d60b7e0b16758 | |
| parent | a605b9ffd3c2e7d227e35b911761f720bf07b7e6 (diff) | |
Reorder link order for Xdmx to fix new screensaver variable referencexorg-server-1_0_99_2
properly; remove previous awful hack.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | hw/dmx/dmxextension.c | 3 |
3 files changed, 7 insertions, 5 deletions
@@ -10,6 +10,11 @@ * Xprint/ps/psout_ftpstype3.c: Fix some includes to point into X11/fonts/ properly. + * configure.ac: + * hw/dmx/dmxextension.c: + Reorder link order for Xdmx to fix new screensaver variable reference + properly; remove previous awful hack. + 2006-04-01 Eric Anholt <anholt@FreeBSD.org> * exa/exa_accel.c: (exaCopyWindow): diff --git a/configure.ac b/configure.ac index 333d96d55..6df4b7d96 100644 --- a/configure.ac +++ b/configure.ac @@ -25,7 +25,7 @@ dnl Process this file with autoconf to create configure. AC_PREREQ(2.57) dnl This is the not the Xorg version number, it's the server version number. dnl Yes, that's weird. -AC_INIT([xorg-server], 1.0.99.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server) +AC_INIT([xorg-server], 1.0.99.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server) AC_CONFIG_SRCDIR([Makefile.am]) AM_INIT_AUTOMAKE([dist-bzip2 foreign]) AM_MAINTAINER_MODE @@ -897,7 +897,7 @@ if test "x$DMX" = xyes; then modules not found.]) fi DMX_INCLUDES="$XEXT_INC $RENDER_INC $XTRAP_INC $RECORD_INC" - XDMX_LIBS="$FB_LIB $MI_LIB $XEXT_LIB $RENDER_LIB $XTRAP_LIB $RECORD_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $MIEXT_DAMAGE_LIB $LBX_LIB $MIEXT_SHADOW_LIB $OS_LIB $CWRAP_LIB" + XDMX_LIBS="$FB_LIB $MI_LIB $RENDER_LIB $XTRAP_LIB $RECORD_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $MIEXT_DAMAGE_LIB $LBX_LIB $MIEXT_SHADOW_LIB $OS_LIB $XEXT_LIB $CWRAP_LIB" AC_SUBST([XDMX_LIBS]) dnl USB sources in DMX require <linux/input.h> diff --git a/hw/dmx/dmxextension.c b/hw/dmx/dmxextension.c index a047b6a98..feadb5e31 100644 --- a/hw/dmx/dmxextension.c +++ b/hw/dmx/dmxextension.c @@ -65,9 +65,6 @@ #include <X11/extensions/dmxproto.h> /* For DMX_BAD_* */ #include "cursorstr.h" -/* XXX nasty hack for MIT-SCREEN-SAVER. Please fix me properly. */ -const Bool screenSaverSuspended = FALSE; - /* The default font is declared in dix/globals.c, but is not included in * _any_ header files. */ extern FontPtr defaultFont; |