frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reorder link order for Xdmx to fix new screensaver variable reference 

properly; remove previous awful hack.
This commit is contained in:
Adam Jackson 2006-04-02 00:46:20 +00:00
parent a605b9ffd3
commit 323fec2029
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -10,6 +10,11 @@
* Xprint/ps/psout_ftpstype3.c: * Xprint/ps/psout_ftpstype3.c:
Fix some includes to point into X11/fonts/ properly. 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> 2006-04-01 Eric Anholt <anholt@FreeBSD.org>
* exa/exa_accel.c: (exaCopyWindow): * exa/exa_accel.c: (exaCopyWindow):

4
configure.ac
View File

@ -25,7 +25,7 @@ dnl Process this file with autoconf to create configure.
AC_PREREQ(2.57) AC_PREREQ(2.57)
dnl This is the not the Xorg version number, it's the server version number. dnl This is the not the Xorg version number, it's the server version number.
dnl Yes, that's weird. 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]) AC_CONFIG_SRCDIR([Makefile.am])
AM_INIT_AUTOMAKE([dist-bzip2 foreign]) AM_INIT_AUTOMAKE([dist-bzip2 foreign])
AM_MAINTAINER_MODE AM_MAINTAINER_MODE
@ -897,7 +897,7 @@ if test "x$DMX" = xyes; then
modules not found.]) modules not found.])
fi fi
DMX_INCLUDES="$XEXT_INC $RENDER_INC $XTRAP_INC $RECORD_INC" 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]) AC_SUBST([XDMX_LIBS])
dnl USB sources in DMX require <linux/input.h> dnl USB sources in DMX require <linux/input.h>

3
hw/dmx/dmxextension.c
View File

@ -65,9 +65,6 @@
#include <X11/extensions/dmxproto.h> /* For DMX_BAD_* */ #include <X11/extensions/dmxproto.h> /* For DMX_BAD_* */
#include "cursorstr.h" #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 /* The default font is declared in dix/globals.c, but is not included in
* _any_ header files. */ * _any_ header files. */
extern FontPtr defaultFont; extern FontPtr defaultFont;