andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make Xephyr build on Solaris:

Browse Source 
Add #include <sys/file.h> on Solaris for FNONBLOCK/FASYNC definitions
hw/kdriver/linux/Makefile.am Move agp.c & agp.h to KDRIVE_HW_SOURCES since
    they're not needed for Xephyr-only builds
Add -lrt to XEPHYR_LIBS if needed to get nanosleep().
This commit is contained in:
Alan Coopersmith 2006-05-03 23:45:16 +00:00
parent fc91ca069d
commit b46d6a44fa
4 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ChangeLog
View File

@ -1,3 +1,17 @@
2006-05-03 Alan Coopersmith <alan.coopersmith@sun.com>
Make Xephyr build on Solaris:
* hw/kdrive/src/kinput.c:
Add #include <sys/file.h> on Solaris for FNONBLOCK/FASYNC definitions
* hw/kdriver/linux/Makefile.am
Move agp.c & agp.h to KDRIVE_HW_SOURCES since they're not needed
for Xephyr-only builds
* configure.ac:
Add -lrt to XEPHYR_LIBS if needed to get nanosleep().
2006-05-03 Adam Jackson <ajax@freedesktop.org>
* hw/xfree86/common/xf86Configure.c:

4
configure.ac
View File

@ -1463,6 +1463,10 @@ AM_CONDITIONAL(KDRIVEFBDEV, [test x"$ac_cv_header_linux_fb_h" = xyes])
#AM_CONDITIONAL(KDRIVEVESA, false)
#AM_CONDITIONAL(KDRIVEFBDEV, false)
# Xephyr needs nanosleep() which is in librt on Solaris
AC_CHECK_FUNC([nanosleep], [],
AC_CHECK_LIB([rt], [nanosleep], XEPHYR_LIBS="$XEPHYR_LIBS -lrt"))
AM_CONDITIONAL(XEPHYR, [test x"$xephyr" = xyes])
XEPHYR_LIBS="$XEPHYR_LIBS $XSERVER_LIBS"
AC_SUBST([XEPHYR_LIBS])

4
hw/kdrive/linux/Makefile.am
View File

@ -16,14 +16,14 @@ endif
if KDRIVE_HW
KDRIVE_HW_SOURCES = \
agp.c \
agp.h \
evdev.c \
keyboard.c \
linux.c
endif
liblinux_a_SOURCES = \
agp.c \
agp.h \
bus.c \
klinux.h \
mouse.c \

3
hw/kdrive/src/kinput.c
View File

@ -37,6 +37,9 @@
#include "kkeymap.h"
#include <signal.h>
#include <stdio.h>
#ifdef sun
#include <sys/file.h> /* needed for FNONBLOCK & FASYNC */
#endif
#ifdef XKB
#include <X11/extensions/XKBsrv.h>