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

Support for BSD apm 

XXX check amd64 pci init
This commit is contained in:
Matthieu Herrb 2008-05-19 05:15:30 +02:00 committed by Matthieu Herrb
parent f4e725f248
commit 10d472bf9d
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
configure.ac
View File

@ -272,6 +272,15 @@ if test -c /dev/xf86 ; then
AC_DEFINE(HAS_APERTURE_DRV, 1, [System has /dev/xf86 aperture driver]) AC_DEFINE(HAS_APERTURE_DRV, 1, [System has /dev/xf86 aperture driver])
fi fi
dnl BSD APM support
AC_CHECK_HEADER([machine/apmvar.h],[
AC_CHECK_HEADER([sys/event.h],
ac_cv_BSD_KQUEUE_APM=yes,
ac_cv_BSD_APM=yes)])
AM_CONDITIONAL(BSD_APM, [test "x$ac_cv_BSD_APM" = xyes])
AM_CONDITIONAL(BSD_KQUEUE_APM, [test "x$ac_cv_BSD_KQUEUE_APM" = xyes])
dnl glibc backtrace support check (hw/xfree86/common/xf86Events.c) dnl glibc backtrace support check (hw/xfree86/common/xf86Events.c)
AC_CHECK_HEADER([execinfo.h],[ AC_CHECK_HEADER([execinfo.h],[
AC_CHECK_LIB(c, backtrace, [ AC_CHECK_LIB(c, backtrace, [
@ -1268,6 +1277,10 @@ if test "x$XORG" = xyes; then
xorg_bus_bsdpci="yes" xorg_bus_bsdpci="yes"
;; ;;
openbsd*) openbsd*)
if test "x$ac_cv_BSD_APM" = xyes \
-o "x$ac_cv_BSD_KQUEUE_APM" = xyes; then
XORG_CFLAGS="$XORG_CFLAGS -DXF86PM"
fi
XORG_OS="openbsd" XORG_OS="openbsd"
XORG_OS_SUBDIR="bsd" XORG_OS_SUBDIR="bsd"
xorg_bus_bsdpci="yes" xorg_bus_bsdpci="yes"

10
hw/xfree86/os-support/bsd/Makefile.am
View File

@ -2,8 +2,16 @@ noinst_LTLIBRARIES = libbsd.la
# FIXME: Add USB mouse support? # FIXME: Add USB mouse support?
# FIXME: APM support. # APM support.
if BSD_KQUEUE_APM
APM_SOURCES = $(srcdir)/bsd_kqueue_apm.c
else
if BSD_APM
APM_SOURCES = $(srcdir)/bsd_apm.c
else
APM_SOURCES = $(srcdir)/../shared/pm_noop.c APM_SOURCES = $(srcdir)/../shared/pm_noop.c
endif
endif
if FREEBSD_KLDLOAD if FREEBSD_KLDLOAD
KMOD_SOURCES = bsd_kmod.c KMOD_SOURCES = bsd_kmod.c