summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@cvs.openbsd.org>2007-04-17 22:06:17 +0000
committerMatthieu Herrb <matthieu@cvs.openbsd.org>2007-04-17 22:06:17 +0000
commitd056b15a99967e2048bab2ce8d29e5cc47e45751 (patch)
tree78e01ada9ed19a6e0fd404d0e76e3c9bfdaa305a
parent59ec3faf0fc941b6567444837045066ed5d59454 (diff)
regen
-rw-r--r--xserver/GL/Makefile.in4
-rw-r--r--xserver/GL/glx/Makefile.in4
-rw-r--r--xserver/GL/mesa/Makefile.in4
-rw-r--r--xserver/GL/mesa/X/Makefile.in4
-rw-r--r--xserver/GL/mesa/array_cache/Makefile.in4
-rw-r--r--xserver/GL/mesa/glapi/Makefile.in4
-rw-r--r--xserver/GL/mesa/main/Makefile.in4
-rw-r--r--xserver/GL/mesa/math/Makefile.in4
-rw-r--r--xserver/GL/mesa/shader/Makefile.in4
-rw-r--r--xserver/GL/mesa/shader/grammar/Makefile.in4
-rw-r--r--xserver/GL/mesa/shader/slang/Makefile.in4
-rw-r--r--xserver/GL/mesa/swrast/Makefile.in4
-rw-r--r--xserver/GL/mesa/swrast_setup/Makefile.in4
-rw-r--r--xserver/GL/mesa/tnl/Makefile.in4
-rw-r--r--xserver/Makefile.in4
-rw-r--r--xserver/XTrap/Makefile.in4
-rw-r--r--xserver/Xext/Makefile.in4
-rw-r--r--xserver/Xi/Makefile.in4
-rw-r--r--xserver/afb/Makefile.in4
-rw-r--r--xserver/cfb/Makefile.in4
-rw-r--r--xserver/cfb32/Makefile.in4
-rw-r--r--xserver/composite/Makefile.in4
-rw-r--r--xserver/configure332
-rw-r--r--xserver/damageext/Makefile.in4
-rw-r--r--xserver/dbe/Makefile.in4
-rw-r--r--xserver/dix/Makefile.in4
-rw-r--r--xserver/doc/Makefile.in4
-rw-r--r--xserver/exa/Makefile.in4
-rw-r--r--xserver/fb/Makefile.in4
-rw-r--r--xserver/hw/Makefile.in4
-rw-r--r--xserver/hw/darwin/Makefile.in4
-rw-r--r--xserver/hw/dmx/Makefile.in4
-rw-r--r--xserver/hw/dmx/config/Makefile.in4
-rw-r--r--xserver/hw/dmx/doc/Makefile.in4
-rw-r--r--xserver/hw/dmx/examples/Makefile.in4
-rw-r--r--xserver/hw/dmx/glxProxy/Makefile.in4
-rw-r--r--xserver/hw/dmx/input/Makefile.in4
-rw-r--r--xserver/hw/kdrive/Makefile.in4
-rw-r--r--xserver/hw/kdrive/ati/Makefile.in4
-rw-r--r--xserver/hw/kdrive/chips/Makefile.in4
-rw-r--r--xserver/hw/kdrive/ephyr/Makefile.in4
-rw-r--r--xserver/hw/kdrive/epson/Makefile.in4
-rw-r--r--xserver/hw/kdrive/fake/Makefile.in4
-rw-r--r--xserver/hw/kdrive/fbdev/Makefile.in4
-rw-r--r--xserver/hw/kdrive/i810/Makefile.in4
-rw-r--r--xserver/hw/kdrive/linux/Makefile.in4
-rw-r--r--xserver/hw/kdrive/mach64/Makefile.in4
-rw-r--r--xserver/hw/kdrive/mga/Makefile.in4
-rw-r--r--xserver/hw/kdrive/neomagic/Makefile.in4
-rw-r--r--xserver/hw/kdrive/nvidia/Makefile.in4
-rw-r--r--xserver/hw/kdrive/pm2/Makefile.in4
-rw-r--r--xserver/hw/kdrive/r128/Makefile.in4
-rw-r--r--xserver/hw/kdrive/sdl/Makefile.in4
-rw-r--r--xserver/hw/kdrive/sis300/Makefile.in4
-rw-r--r--xserver/hw/kdrive/smi/Makefile.in4
-rw-r--r--xserver/hw/kdrive/src/Makefile.in4
-rw-r--r--xserver/hw/kdrive/vesa/Makefile.in4
-rw-r--r--xserver/hw/kdrive/via/Makefile.in4
-rw-r--r--xserver/hw/vfb/Makefile.in4
-rw-r--r--xserver/hw/xfree86/Makefile.in4
-rw-r--r--xserver/hw/xfree86/common/Makefile.in4
-rw-r--r--xserver/hw/xfree86/ddc/Makefile.in4
-rw-r--r--xserver/hw/xfree86/dixmods/Makefile.in4
-rw-r--r--xserver/hw/xfree86/dixmods/extmod/Makefile.in4
-rw-r--r--xserver/hw/xfree86/doc/Makefile.in4
-rw-r--r--xserver/hw/xfree86/doc/devel/Makefile.in4
-rw-r--r--xserver/hw/xfree86/doc/man/Makefile.in4
-rw-r--r--xserver/hw/xfree86/doc/sgml/Makefile.in4
-rw-r--r--xserver/hw/xfree86/dri/Makefile.in4
-rw-r--r--xserver/hw/xfree86/dummylib/Makefile.in4
-rw-r--r--xserver/hw/xfree86/exa/Makefile.in4
-rw-r--r--xserver/hw/xfree86/fbdevhw/Makefile.in4
-rw-r--r--xserver/hw/xfree86/i2c/Makefile.in4
-rw-r--r--xserver/hw/xfree86/int10/Makefile.in4
-rw-r--r--xserver/hw/xfree86/loader/Makefile.in4
-rw-r--r--xserver/hw/xfree86/os-support/Makefile.in4
-rw-r--r--xserver/hw/xfree86/os-support/bsd/Makefile.in33
-rw-r--r--xserver/hw/xfree86/os-support/bus/Makefile.in4
-rw-r--r--xserver/hw/xfree86/os-support/hurd/Makefile.in4
-rw-r--r--xserver/hw/xfree86/os-support/linux/Makefile.in4
-rw-r--r--xserver/hw/xfree86/os-support/lynxos/Makefile.in4
-rw-r--r--xserver/hw/xfree86/os-support/misc/Makefile.in4
-rw-r--r--xserver/hw/xfree86/os-support/sco/Makefile.in4
-rw-r--r--xserver/hw/xfree86/os-support/solaris/Makefile.in4
-rw-r--r--xserver/hw/xfree86/os-support/sysv/Makefile.in4
-rw-r--r--xserver/hw/xfree86/os-support/usl/Makefile.in4
-rw-r--r--xserver/hw/xfree86/parser/Makefile.in4
-rw-r--r--xserver/hw/xfree86/rac/Makefile.in4
-rw-r--r--xserver/hw/xfree86/ramdac/Makefile.in4
-rw-r--r--xserver/hw/xfree86/scanpci/Makefile.in4
-rw-r--r--xserver/hw/xfree86/shadowfb/Makefile.in4
-rw-r--r--xserver/hw/xfree86/utils/Makefile.in4
-rw-r--r--xserver/hw/xfree86/utils/cvt/Makefile.in4
-rw-r--r--xserver/hw/xfree86/utils/gtf/Makefile.in4
-rw-r--r--xserver/hw/xfree86/utils/ioport/Makefile.in4
-rw-r--r--xserver/hw/xfree86/utils/kbd_mode/Makefile.in4
-rw-r--r--xserver/hw/xfree86/utils/pcitweak/Makefile.in4
-rw-r--r--xserver/hw/xfree86/utils/scanpci/Makefile.in4
-rw-r--r--xserver/hw/xfree86/utils/xorgcfg/Makefile.in4
-rw-r--r--xserver/hw/xfree86/utils/xorgconfig/Makefile.in4
-rw-r--r--xserver/hw/xfree86/vbe/Makefile.in4
-rw-r--r--xserver/hw/xfree86/vgahw/Makefile.in4
-rw-r--r--xserver/hw/xfree86/x86emu/Makefile.in4
-rw-r--r--xserver/hw/xfree86/xaa/Makefile.in4
-rw-r--r--xserver/hw/xfree86/xf1bpp/Makefile.in4
-rw-r--r--xserver/hw/xfree86/xf4bpp/Makefile.in4
-rw-r--r--xserver/hw/xfree86/xf8_16bpp/Makefile.in4
-rw-r--r--xserver/hw/xfree86/xf8_32bpp/Makefile.in4
-rw-r--r--xserver/hw/xgl/Makefile.in4
-rw-r--r--xserver/hw/xgl/egl/Makefile.in4
-rw-r--r--xserver/hw/xgl/egl/module/Makefile.in4
-rw-r--r--xserver/hw/xgl/glx/Makefile.in4
-rw-r--r--xserver/hw/xgl/glx/module/Makefile.in4
-rw-r--r--xserver/hw/xgl/glxext/Makefile.in4
-rw-r--r--xserver/hw/xgl/glxext/module/Makefile.in4
-rw-r--r--xserver/hw/xnest/Makefile.in4
-rw-r--r--xserver/hw/xprint/Makefile.in4
-rw-r--r--xserver/hw/xprint/config/C/Makefile.in4
-rw-r--r--xserver/hw/xprint/config/C/print/Makefile.in4
-rw-r--r--xserver/hw/xprint/config/C/print/attributes/Makefile.in4
-rw-r--r--xserver/hw/xprint/config/C/print/ddx-config/Makefile.in4
-rw-r--r--xserver/hw/xprint/config/C/print/ddx-config/raster/Makefile.in4
-rw-r--r--xserver/hw/xprint/config/C/print/models/CANONBJ10E-GS/Makefile.in4
-rw-r--r--xserver/hw/xprint/config/C/print/models/CANONC3200-PS/Makefile.in4
-rw-r--r--xserver/hw/xprint/config/C/print/models/CANONC3200-PS/fonts/Makefile.in4
-rw-r--r--xserver/hw/xprint/config/C/print/models/GSdefault/Makefile.in4
-rw-r--r--xserver/hw/xprint/config/C/print/models/HPDJ1600C/Makefile.in4
-rw-r--r--xserver/hw/xprint/config/C/print/models/HPDJ1600C/fonts/Makefile.in4
-rw-r--r--xserver/hw/xprint/config/C/print/models/HPLJ4050-PS/Makefile.in4
-rw-r--r--xserver/hw/xprint/config/C/print/models/HPLJ4050-PS/fonts/Makefile.in4
-rw-r--r--xserver/hw/xprint/config/C/print/models/HPLJ4family/Makefile.in4
-rw-r--r--xserver/hw/xprint/config/C/print/models/HPLJ4family/fonts/Makefile.in4
-rw-r--r--xserver/hw/xprint/config/C/print/models/Makefile.in4
-rw-r--r--xserver/hw/xprint/config/C/print/models/PS2PDFspooldir-GS/Makefile.in4
-rw-r--r--xserver/hw/xprint/config/C/print/models/PSdefault/Makefile.in4
-rw-r--r--xserver/hw/xprint/config/C/print/models/PSdefault/fonts/Makefile.in4
-rw-r--r--xserver/hw/xprint/config/C/print/models/PSspooldir/Makefile.in4
-rw-r--r--xserver/hw/xprint/config/C/print/models/SPSPARC2/Makefile.in4
-rw-r--r--xserver/hw/xprint/config/C/print/models/SPSPARC2/fonts/Makefile.in4
-rw-r--r--xserver/hw/xprint/config/Makefile.in4
-rw-r--r--xserver/hw/xprint/config/en_US/Makefile.in4
-rw-r--r--xserver/hw/xprint/config/en_US/print/Makefile.in4
-rw-r--r--xserver/hw/xprint/config/en_US/print/attributes/Makefile.in4
-rw-r--r--xserver/hw/xprint/doc/Makefile.in4
-rw-r--r--xserver/hw/xprint/etc/Makefile.in4
-rw-r--r--xserver/hw/xprint/etc/Xsession.d/Makefile.in4
-rw-r--r--xserver/hw/xprint/etc/init.d/Makefile.in4
-rw-r--r--xserver/hw/xprint/etc/profile.d/Makefile.in4
-rw-r--r--xserver/hw/xprint/pcl-mono/Makefile.in4
-rw-r--r--xserver/hw/xprint/pcl/Makefile.in4
-rw-r--r--xserver/hw/xprint/ps/Makefile.in4
-rw-r--r--xserver/hw/xprint/raster/Makefile.in4
-rw-r--r--xserver/hw/xwin/Makefile.in4
-rw-r--r--xserver/include/Makefile.in4
-rw-r--r--xserver/ltmain.sh20
-rw-r--r--xserver/mfb/Makefile.in4
-rw-r--r--xserver/mi/Makefile.in4
-rw-r--r--xserver/miext/Makefile.in4
-rw-r--r--xserver/miext/cw/Makefile.in4
-rw-r--r--xserver/miext/damage/Makefile.in4
-rw-r--r--xserver/miext/rootless/Makefile.in4
-rw-r--r--xserver/miext/shadow/Makefile.in4
-rw-r--r--xserver/os/Makefile.in4
-rw-r--r--xserver/randr/Makefile.in4
-rw-r--r--xserver/record/Makefile.in4
-rw-r--r--xserver/render/Makefile.in4
-rw-r--r--xserver/xfixes/Makefile.in4
-rw-r--r--xserver/xkb/Makefile.in4
168 files changed, 1032 insertions, 13 deletions
diff --git a/xserver/GL/Makefile.in b/xserver/GL/Makefile.in
index ce914750b..826935832 100644
--- a/xserver/GL/Makefile.in
+++ b/xserver/GL/Makefile.in
@@ -93,8 +93,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/GL/glx/Makefile.in b/xserver/GL/glx/Makefile.in
index 7e8e89d64..63613d98c 100644
--- a/xserver/GL/glx/Makefile.in
+++ b/xserver/GL/glx/Makefile.in
@@ -116,8 +116,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/GL/mesa/Makefile.in b/xserver/GL/mesa/Makefile.in
index 90bf389ef..4018bef14 100644
--- a/xserver/GL/mesa/Makefile.in
+++ b/xserver/GL/mesa/Makefile.in
@@ -112,8 +112,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/GL/mesa/X/Makefile.in b/xserver/GL/mesa/X/Makefile.in
index aaea96ce0..3b0f9aff7 100644
--- a/xserver/GL/mesa/X/Makefile.in
+++ b/xserver/GL/mesa/X/Makefile.in
@@ -104,8 +104,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/GL/mesa/array_cache/Makefile.in b/xserver/GL/mesa/array_cache/Makefile.in
index d7902b5c6..a6025363e 100644
--- a/xserver/GL/mesa/array_cache/Makefile.in
+++ b/xserver/GL/mesa/array_cache/Makefile.in
@@ -102,8 +102,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/GL/mesa/glapi/Makefile.in b/xserver/GL/mesa/glapi/Makefile.in
index 15a253e1b..f925c3891 100644
--- a/xserver/GL/mesa/glapi/Makefile.in
+++ b/xserver/GL/mesa/glapi/Makefile.in
@@ -102,8 +102,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/GL/mesa/main/Makefile.in b/xserver/GL/mesa/main/Makefile.in
index b5979f7a3..04c4b9a04 100644
--- a/xserver/GL/mesa/main/Makefile.in
+++ b/xserver/GL/mesa/main/Makefile.in
@@ -115,8 +115,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/GL/mesa/math/Makefile.in b/xserver/GL/mesa/math/Makefile.in
index aad0f509a..bda521bf7 100644
--- a/xserver/GL/mesa/math/Makefile.in
+++ b/xserver/GL/mesa/math/Makefile.in
@@ -104,8 +104,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/GL/mesa/shader/Makefile.in b/xserver/GL/mesa/shader/Makefile.in
index 8d6c1b9b4..9f02aaa07 100644
--- a/xserver/GL/mesa/shader/Makefile.in
+++ b/xserver/GL/mesa/shader/Makefile.in
@@ -112,8 +112,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/GL/mesa/shader/grammar/Makefile.in b/xserver/GL/mesa/shader/grammar/Makefile.in
index 9920b6644..869d9ca88 100644
--- a/xserver/GL/mesa/shader/grammar/Makefile.in
+++ b/xserver/GL/mesa/shader/grammar/Makefile.in
@@ -102,8 +102,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/GL/mesa/shader/slang/Makefile.in b/xserver/GL/mesa/shader/slang/Makefile.in
index 3a995719b..5d723fa56 100644
--- a/xserver/GL/mesa/shader/slang/Makefile.in
+++ b/xserver/GL/mesa/shader/slang/Makefile.in
@@ -111,8 +111,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/GL/mesa/swrast/Makefile.in b/xserver/GL/mesa/swrast/Makefile.in
index 911496223..af5130d20 100644
--- a/xserver/GL/mesa/swrast/Makefile.in
+++ b/xserver/GL/mesa/swrast/Makefile.in
@@ -108,8 +108,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/GL/mesa/swrast_setup/Makefile.in b/xserver/GL/mesa/swrast_setup/Makefile.in
index e77ea30f0..d0e08f3ef 100644
--- a/xserver/GL/mesa/swrast_setup/Makefile.in
+++ b/xserver/GL/mesa/swrast_setup/Makefile.in
@@ -102,8 +102,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/GL/mesa/tnl/Makefile.in b/xserver/GL/mesa/tnl/Makefile.in
index 83edc716b..a526c586f 100644
--- a/xserver/GL/mesa/tnl/Makefile.in
+++ b/xserver/GL/mesa/tnl/Makefile.in
@@ -109,8 +109,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/Makefile.in b/xserver/Makefile.in
index 407f4b13b..7f486b824 100644
--- a/xserver/Makefile.in
+++ b/xserver/Makefile.in
@@ -119,8 +119,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/XTrap/Makefile.in b/xserver/XTrap/Makefile.in
index 464dc833e..bbe775741 100644
--- a/xserver/XTrap/Makefile.in
+++ b/xserver/XTrap/Makefile.in
@@ -103,8 +103,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/Xext/Makefile.in b/xserver/Xext/Makefile.in
index 6399a9ff6..1a7683e86 100644
--- a/xserver/Xext/Makefile.in
+++ b/xserver/Xext/Makefile.in
@@ -208,8 +208,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/Xi/Makefile.in b/xserver/Xi/Makefile.in
index 328664a46..e9bca916d 100644
--- a/xserver/Xi/Makefile.in
+++ b/xserver/Xi/Makefile.in
@@ -109,8 +109,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/afb/Makefile.in b/xserver/afb/Makefile.in
index b32802b46..73babdd9c 100644
--- a/xserver/afb/Makefile.in
+++ b/xserver/afb/Makefile.in
@@ -122,8 +122,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/cfb/Makefile.in b/xserver/cfb/Makefile.in
index 93a33a78e..283ff8061 100644
--- a/xserver/cfb/Makefile.in
+++ b/xserver/cfb/Makefile.in
@@ -127,8 +127,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/cfb32/Makefile.in b/xserver/cfb32/Makefile.in
index 0c33fd1ad..fd4fda842 100644
--- a/xserver/cfb32/Makefile.in
+++ b/xserver/cfb32/Makefile.in
@@ -116,8 +116,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/composite/Makefile.in b/xserver/composite/Makefile.in
index 72c4084e6..05139793b 100644
--- a/xserver/composite/Makefile.in
+++ b/xserver/composite/Makefile.in
@@ -103,8 +103,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/configure b/xserver/configure
index f2029a25c..0fb48999b 100644
--- a/xserver/configure
+++ b/xserver/configure
@@ -465,7 +465,7 @@ ac_includes_default="\
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CCAS CCASFLAGS LN_S build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PKG_CONFIG ac_pt_PKG_CONFIG LEX LEXLIB LEX_OUTPUT_ROOT YACC RAWCPP RAWCPPFLAGS ALLOCA NEED_STRLCAT_TRUE NEED_STRLCAT_FALSE NEED_VSNPRINTF_TRUE NEED_VSNPRINTF_FALSE AGP_TRUE AGP_FALSE LNXAPM_TRUE LNXAPM_FALSE FBDEVHW_TRUE FBDEVHW_FALSE FREEBSD_KLDLOAD_TRUE FREEBSD_KLDLOAD_FALSE ALPHA_VIDEO_TRUE ALPHA_VIDEO_FALSE ARM_VIDEO_TRUE ARM_VIDEO_FALSE HP300_VIDEO_TRUE HP300_VIDEO_FALSE HPPA_VIDEO_TRUE HPPA_VIDEO_FALSE I386_VIDEO_TRUE I386_VIDEO_FALSE PPC_VIDEO_TRUE PPC_VIDEO_FALSE SPARC64_VIDEO_TRUE SPARC64_VIDEO_FALSE KDRIVE_HW_TRUE KDRIVE_HW_FALSE MMX_CAPABLE_TRUE MMX_CAPABLE_FALSE X_PRIVSEP_TRUE X_PRIVSEP_FALSE INSTALL_SETUID_TRUE INSTALL_SETUID_FALSE INT10_VM86_TRUE INT10_VM86_FALSE INT10_X86EMU_TRUE INT10_X86EMU_FALSE INT10_STUB_TRUE INT10_STUB_FALSE BUILDDOCS_TRUE BUILDDOCS_FALSE LINUXDOC PS2PDF BUILD_LINUXDOC_TRUE BUILD_LINUXDOC_FALSE BUILD_PDFDOC_TRUE BUILD_PDFDOC_FALSE MAKE_TEXT MAKE_PS MAKE_PDF MAKE_HTML INSTALL_LIBXF86CONFIG_TRUE INSTALL_LIBXF86CONFIG_FALSE XV_TRUE XV_FALSE XVMC_TRUE XVMC_FALSE DGA_TRUE DGA_FALSE COMPOSITE_TRUE COMPOSITE_FALSE MITSHM_TRUE MITSHM_FALSE XTRAP_TRUE XTRAP_FALSE RECORD_TRUE RECORD_FALSE SCREENSAVER_TRUE SCREENSAVER_FALSE RES_TRUE RES_FALSE XLIB_CFLAGS XLIB_LIBS GL_CFLAGS GL_LIBS GLX_TRUE GLX_FALSE MESA_SOURCE AIGLX_TRUE AIGLX_FALSE GLX_DEFINES DRI_TRUE DRI_FALSE DRIPROTO_CFLAGS DRIPROTO_LIBS LIBDRM_CFLAGS LIBDRM_LIBS XINERAMA_TRUE XINERAMA_FALSE XACE_TRUE XACE_FALSE XCSECURITY_TRUE XCSECURITY_FALSE XEVIE_TRUE XEVIE_FALSE APPGROUP_TRUE APPGROUP_FALSE CUP_TRUE CUP_FALSE EVI_TRUE EVI_FALSE MULTIBUFFER_TRUE MULTIBUFFER_FALSE FONTCACHE_TRUE FONTCACHE_FALSE DBE_TRUE DBE_FALSE XF86BIGFONT_TRUE XF86BIGFONT_FALSE DPMSExtension_TRUE DPMSExtension_FALSE XPRINTPROTO_CFLAGS XPRINTPROTO_LIBS XPRINT_TRUE XPRINT_FALSE XCALIBRATE_TRUE XCALIBRATE_FALSE XINPUT_TRUE XINPUT_FALSE XF86UTILS_TRUE XF86UTILS_FALSE XDMCP_CFLAGS XDMCP_LIBS XDMCP_TRUE XDMCP_FALSE XDMAUTH_TRUE XDMAUTH_FALSE USE_RGB_BUILTIN_TRUE USE_RGB_BUILTIN_FALSE COMPILEDDEFAULTFONTPATH RGB_DB BASE_FONT_PATH DRI_DRIVER_PATH VENDOR_STRING VENDOR_STRING_SHORT VENDOR_RELEASE VENDOR_MAN_VERSION DEBUG_TRUE DEBUG_FALSE XSERVERCFLAGS_CFLAGS XSERVERCFLAGS_LIBS XSERVERLIBS_CFLAGS XSERVERLIBS_LIBS SYS_LIBS XSERVER_LIBS DMXMODULES_CFLAGS DMXMODULES_LIBS DMX_TRUE DMX_FALSE XDMX_LIBS XDMXCONFIG_DEP_CFLAGS XDMXCONFIG_DEP_LIBS DMXEXAMPLES_DEP_CFLAGS DMXEXAMPLES_DEP_LIBS DMXXMUEXAMPLES_DEP_CFLAGS DMXXMUEXAMPLES_DEP_LIBS DMXXIEXAMPLES_DEP_CFLAGS DMXXIEXAMPLES_DEP_LIBS XTSTEXAMPLES_DEP_CFLAGS XTSTEXAMPLES_DEP_LIBS XRESEXAMPLES_DEP_CFLAGS XRESEXAMPLES_DEP_LIBS X11EXAMPLES_DEP_CFLAGS X11EXAMPLES_DEP_LIBS DMX_BUILD_LNX_TRUE DMX_BUILD_LNX_FALSE DMX_BUILD_USB_TRUE DMX_BUILD_USB_FALSE XVFB_TRUE XVFB_FALSE XVFB_LIBS XNESTMODULES_CFLAGS XNESTMODULES_LIBS XNEST_TRUE XNEST_FALSE XNEST_LIBS XGLMODULES_CFLAGS XGLMODULES_LIBS XGL_TRUE XGL_FALSE XGL_LIBS xglmoduledir XGL_MODULE_PATH XEGLMODULES_CFLAGS XEGLMODULES_LIBS XEGL_TRUE XEGL_FALSE XEGL_LIBS XGLXMODULES_CFLAGS XGLXMODULES_LIBS XGLX_TRUE XGLX_FALSE XGLX_LIBS XORG_CORE_LIBS SOLARIS_INOUT_ARCH SOLARIS_ASM_CFLAGS XORG_LIBS XORG_INCS XORG_OS XORG_OS_SUBDIR XORG_OS_KBD PERL XORG_CFLAGS LD_EXPORT_SYMBOLS_FLAG __XCONFIGFILE__ XF86CONFIGFILE DEFAULT_MODULE_PATH DEFAULT_LIBRARY_PATH DEFAULT_LOGPREFIX moduledir driverdir sdkdir extdir logdir XORG_TRUE XORG_FALSE XORG_BUS_LINUXPCI_TRUE XORG_BUS_LINUXPCI_FALSE XORG_BUS_FREEBSDPCI_TRUE XORG_BUS_FREEBSDPCI_FALSE XORG_BUS_NETBSDPCI_TRUE XORG_BUS_NETBSDPCI_FALSE XORG_BUS_IX86PCI_TRUE XORG_BUS_IX86PCI_FALSE XORG_BUS_PPCPCI_TRUE XORG_BUS_PPCPCI_FALSE XORG_BUS_SPARCPCI_TRUE XORG_BUS_SPARCPCI_FALSE XORG_BUS_SPARC_TRUE XORG_BUS_SPARC_FALSE XORG_LOADER_SPARC_TRUE XORG_LOADER_SPARC_FALSE LINUX_IA64_TRUE LINUX_IA64_FALSE LINUX_ALPHA_TRUE LINUX_ALPHA_FALSE LNXACPI_TRUE LNXACPI_FALSE SOLARIS_USL_CONSOLE_TRUE SOLARIS_USL_CONSOLE_FALSE SOLARIS_ASM_INLINE_TRUE SOLARIS_ASM_INLINE_FALSE MFB_TRUE MFB_FALSE CFB_TRUE CFB_FALSE AFB_TRUE AFB_FALSE XPRINT_CFLAGS XPRINT_LIBS xpconfigdir MKFONTSCALE MKFONTDIR FREETYPE_CFLAGS FREETYPE_LIBS ft_config FREETYPE_REQUIRES XP_USE_FREETYPE_TRUE XP_USE_FREETYPE_FALSE XWIN_LIBS XWINMODULES_CFLAGS XWINMODULES_LIBS XWIN_SERVER_NAME XWIN_SYSTEM_LIBS XWIN_TRUE XWIN_FALSE XWIN_MULTIWINDOW_TRUE XWIN_MULTIWINDOW_FALSE XWIN_MULTIWINDOWEXTWM_TRUE XWIN_MULTIWINDOWEXTWM_FALSE XWIN_CLIPBOARD_TRUE XWIN_CLIPBOARD_FALSE XWIN_GLX_WINDOWS_TRUE XWIN_GLX_WINDOWS_FALSE XWIN_NATIVEGDI_TRUE XWIN_NATIVEGDI_FALSE XWIN_PRIMARYFB_TRUE XWIN_PRIMARYFB_FALSE XWIN_RANDR_TRUE XWIN_RANDR_FALSE XWIN_XV_TRUE XWIN_XV_FALSE KDRIVE_TRUE KDRIVE_FALSE TSLIB_CFLAGS TSLIB_LIBS XEPHYR_CFLAGS XEPHYR_LIBS KDRIVE_INCS KDRIVE_PURE_INCS KDRIVE_CFLAGS KDRIVE_PURE_LIBS KDRIVE_LIBS KDRIVELINUX_TRUE KDRIVELINUX_FALSE TSLIB_TRUE TSLIB_FALSE H3600_TS_TRUE H3600_TS_FALSE KDRIVEVESA_TRUE KDRIVEVESA_FALSE KDRIVEFBDEV_TRUE KDRIVEFBDEV_FALSE XEPHYR_TRUE XEPHYR_FALSE XEPHYR_INCS XSDLSERVER_TRUE XSDLSERVER_FALSE XSDL_LIBS XSDL_INCS XKB_BASE_DIRECTORY XKB_BIN_DIRECTORY XKM_OUTPUT_DIR XKB_COMPILED_DIR PROJECTROOT XORGCONFIG_DEP_CFLAGS XORGCONFIG_DEP_LIBS XORGCFG_DEP_CFLAGS XORGCFG_DEP_LIBS APPDEFAULTDIR BUILD_XORGCFG_TRUE BUILD_XORGCFG_FALSE USE_CURSES_TRUE USE_CURSES_FALSE BUILD_KBD_MODE_TRUE BUILD_KBD_MODE_FALSE BSD_KBD_MODE_TRUE BSD_KBD_MODE_FALSE SUN_KBD_MODE_TRUE SUN_KBD_MODE_FALSE BUILD_DATE DIX_CFLAGS libdir exec_prefix prefix APP_MAN_SUFFIX LIB_MAN_SUFFIX FILE_MAN_SUFFIX MISC_MAN_SUFFIX DRIVER_MAN_SUFFIX ADMIN_MAN_SUFFIX APP_MAN_DIR LIB_MAN_DIR FILE_MAN_DIR MISC_MAN_DIR DRIVER_MAN_DIR ADMIN_MAN_DIR LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CCAS CCASFLAGS LN_S build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PKG_CONFIG ac_pt_PKG_CONFIG LEX LEXLIB LEX_OUTPUT_ROOT YACC RAWCPP RAWCPPFLAGS ALLOCA NEED_STRLCAT_TRUE NEED_STRLCAT_FALSE NEED_VSNPRINTF_TRUE NEED_VSNPRINTF_FALSE AGP_TRUE AGP_FALSE LNXAPM_TRUE LNXAPM_FALSE FBDEVHW_TRUE FBDEVHW_FALSE FREEBSD_KLDLOAD_TRUE FREEBSD_KLDLOAD_FALSE BSD_APM_TRUE BSD_APM_FALSE BSD_KQUEUE_APM_TRUE BSD_KQUEUE_APM_FALSE ALPHA_VIDEO_TRUE ALPHA_VIDEO_FALSE ARM_VIDEO_TRUE ARM_VIDEO_FALSE HP300_VIDEO_TRUE HP300_VIDEO_FALSE HPPA_VIDEO_TRUE HPPA_VIDEO_FALSE I386_VIDEO_TRUE I386_VIDEO_FALSE PPC_VIDEO_TRUE PPC_VIDEO_FALSE SPARC64_VIDEO_TRUE SPARC64_VIDEO_FALSE KDRIVE_HW_TRUE KDRIVE_HW_FALSE MMX_CAPABLE_TRUE MMX_CAPABLE_FALSE X_PRIVSEP_TRUE X_PRIVSEP_FALSE INSTALL_SETUID_TRUE INSTALL_SETUID_FALSE INT10_VM86_TRUE INT10_VM86_FALSE INT10_X86EMU_TRUE INT10_X86EMU_FALSE INT10_STUB_TRUE INT10_STUB_FALSE BUILDDOCS_TRUE BUILDDOCS_FALSE LINUXDOC PS2PDF BUILD_LINUXDOC_TRUE BUILD_LINUXDOC_FALSE BUILD_PDFDOC_TRUE BUILD_PDFDOC_FALSE MAKE_TEXT MAKE_PS MAKE_PDF MAKE_HTML INSTALL_LIBXF86CONFIG_TRUE INSTALL_LIBXF86CONFIG_FALSE XV_TRUE XV_FALSE XVMC_TRUE XVMC_FALSE DGA_TRUE DGA_FALSE COMPOSITE_TRUE COMPOSITE_FALSE MITSHM_TRUE MITSHM_FALSE XTRAP_TRUE XTRAP_FALSE RECORD_TRUE RECORD_FALSE SCREENSAVER_TRUE SCREENSAVER_FALSE RES_TRUE RES_FALSE XLIB_CFLAGS XLIB_LIBS GL_CFLAGS GL_LIBS GLX_TRUE GLX_FALSE MESA_SOURCE AIGLX_TRUE AIGLX_FALSE GLX_DEFINES DRI_TRUE DRI_FALSE DRIPROTO_CFLAGS DRIPROTO_LIBS LIBDRM_CFLAGS LIBDRM_LIBS XINERAMA_TRUE XINERAMA_FALSE XACE_TRUE XACE_FALSE XCSECURITY_TRUE XCSECURITY_FALSE XEVIE_TRUE XEVIE_FALSE APPGROUP_TRUE APPGROUP_FALSE CUP_TRUE CUP_FALSE EVI_TRUE EVI_FALSE MULTIBUFFER_TRUE MULTIBUFFER_FALSE FONTCACHE_TRUE FONTCACHE_FALSE DBE_TRUE DBE_FALSE XF86BIGFONT_TRUE XF86BIGFONT_FALSE DPMSExtension_TRUE DPMSExtension_FALSE XPRINTPROTO_CFLAGS XPRINTPROTO_LIBS XPRINT_TRUE XPRINT_FALSE XCALIBRATE_TRUE XCALIBRATE_FALSE XINPUT_TRUE XINPUT_FALSE XF86UTILS_TRUE XF86UTILS_FALSE XDMCP_CFLAGS XDMCP_LIBS XDMCP_TRUE XDMCP_FALSE XDMAUTH_TRUE XDMAUTH_FALSE USE_RGB_BUILTIN_TRUE USE_RGB_BUILTIN_FALSE COMPILEDDEFAULTFONTPATH RGB_DB BASE_FONT_PATH DRI_DRIVER_PATH VENDOR_STRING VENDOR_STRING_SHORT VENDOR_RELEASE VENDOR_MAN_VERSION DEBUG_TRUE DEBUG_FALSE XSERVERCFLAGS_CFLAGS XSERVERCFLAGS_LIBS XSERVERLIBS_CFLAGS XSERVERLIBS_LIBS SYS_LIBS XSERVER_LIBS DMXMODULES_CFLAGS DMXMODULES_LIBS DMX_TRUE DMX_FALSE XDMX_LIBS XDMXCONFIG_DEP_CFLAGS XDMXCONFIG_DEP_LIBS DMXEXAMPLES_DEP_CFLAGS DMXEXAMPLES_DEP_LIBS DMXXMUEXAMPLES_DEP_CFLAGS DMXXMUEXAMPLES_DEP_LIBS DMXXIEXAMPLES_DEP_CFLAGS DMXXIEXAMPLES_DEP_LIBS XTSTEXAMPLES_DEP_CFLAGS XTSTEXAMPLES_DEP_LIBS XRESEXAMPLES_DEP_CFLAGS XRESEXAMPLES_DEP_LIBS X11EXAMPLES_DEP_CFLAGS X11EXAMPLES_DEP_LIBS DMX_BUILD_LNX_TRUE DMX_BUILD_LNX_FALSE DMX_BUILD_USB_TRUE DMX_BUILD_USB_FALSE XVFB_TRUE XVFB_FALSE XVFB_LIBS XNESTMODULES_CFLAGS XNESTMODULES_LIBS XNEST_TRUE XNEST_FALSE XNEST_LIBS XGLMODULES_CFLAGS XGLMODULES_LIBS XGL_TRUE XGL_FALSE XGL_LIBS xglmoduledir XGL_MODULE_PATH XEGLMODULES_CFLAGS XEGLMODULES_LIBS XEGL_TRUE XEGL_FALSE XEGL_LIBS XGLXMODULES_CFLAGS XGLXMODULES_LIBS XGLX_TRUE XGLX_FALSE XGLX_LIBS XORG_CORE_LIBS SOLARIS_INOUT_ARCH SOLARIS_ASM_CFLAGS XORG_LIBS XORG_INCS XORG_OS XORG_OS_SUBDIR XORG_OS_KBD PERL XORG_CFLAGS LD_EXPORT_SYMBOLS_FLAG __XCONFIGFILE__ XF86CONFIGFILE DEFAULT_MODULE_PATH DEFAULT_LIBRARY_PATH DEFAULT_LOGPREFIX moduledir driverdir sdkdir extdir logdir XORG_TRUE XORG_FALSE XORG_BUS_LINUXPCI_TRUE XORG_BUS_LINUXPCI_FALSE XORG_BUS_FREEBSDPCI_TRUE XORG_BUS_FREEBSDPCI_FALSE XORG_BUS_NETBSDPCI_TRUE XORG_BUS_NETBSDPCI_FALSE XORG_BUS_IX86PCI_TRUE XORG_BUS_IX86PCI_FALSE XORG_BUS_PPCPCI_TRUE XORG_BUS_PPCPCI_FALSE XORG_BUS_SPARCPCI_TRUE XORG_BUS_SPARCPCI_FALSE XORG_BUS_SPARC_TRUE XORG_BUS_SPARC_FALSE XORG_LOADER_SPARC_TRUE XORG_LOADER_SPARC_FALSE LINUX_IA64_TRUE LINUX_IA64_FALSE LINUX_ALPHA_TRUE LINUX_ALPHA_FALSE LNXACPI_TRUE LNXACPI_FALSE SOLARIS_USL_CONSOLE_TRUE SOLARIS_USL_CONSOLE_FALSE SOLARIS_ASM_INLINE_TRUE SOLARIS_ASM_INLINE_FALSE MFB_TRUE MFB_FALSE CFB_TRUE CFB_FALSE AFB_TRUE AFB_FALSE XPRINT_CFLAGS XPRINT_LIBS xpconfigdir MKFONTSCALE MKFONTDIR FREETYPE_CFLAGS FREETYPE_LIBS ft_config FREETYPE_REQUIRES XP_USE_FREETYPE_TRUE XP_USE_FREETYPE_FALSE XWIN_LIBS XWINMODULES_CFLAGS XWINMODULES_LIBS XWIN_SERVER_NAME XWIN_SYSTEM_LIBS XWIN_TRUE XWIN_FALSE XWIN_MULTIWINDOW_TRUE XWIN_MULTIWINDOW_FALSE XWIN_MULTIWINDOWEXTWM_TRUE XWIN_MULTIWINDOWEXTWM_FALSE XWIN_CLIPBOARD_TRUE XWIN_CLIPBOARD_FALSE XWIN_GLX_WINDOWS_TRUE XWIN_GLX_WINDOWS_FALSE XWIN_NATIVEGDI_TRUE XWIN_NATIVEGDI_FALSE XWIN_PRIMARYFB_TRUE XWIN_PRIMARYFB_FALSE XWIN_RANDR_TRUE XWIN_RANDR_FALSE XWIN_XV_TRUE XWIN_XV_FALSE KDRIVE_TRUE KDRIVE_FALSE TSLIB_CFLAGS TSLIB_LIBS XEPHYR_CFLAGS XEPHYR_LIBS KDRIVE_INCS KDRIVE_PURE_INCS KDRIVE_CFLAGS KDRIVE_PURE_LIBS KDRIVE_LIBS KDRIVELINUX_TRUE KDRIVELINUX_FALSE TSLIB_TRUE TSLIB_FALSE H3600_TS_TRUE H3600_TS_FALSE KDRIVEVESA_TRUE KDRIVEVESA_FALSE KDRIVEFBDEV_TRUE KDRIVEFBDEV_FALSE XEPHYR_TRUE XEPHYR_FALSE XEPHYR_INCS XSDLSERVER_TRUE XSDLSERVER_FALSE XSDL_LIBS XSDL_INCS XKB_BASE_DIRECTORY XKB_BIN_DIRECTORY XKM_OUTPUT_DIR XKB_COMPILED_DIR PROJECTROOT XORGCONFIG_DEP_CFLAGS XORGCONFIG_DEP_LIBS XORGCFG_DEP_CFLAGS XORGCFG_DEP_LIBS APPDEFAULTDIR BUILD_XORGCFG_TRUE BUILD_XORGCFG_FALSE USE_CURSES_TRUE USE_CURSES_FALSE BUILD_KBD_MODE_TRUE BUILD_KBD_MODE_FALSE BSD_KBD_MODE_TRUE BSD_KBD_MODE_FALSE SUN_KBD_MODE_TRUE SUN_KBD_MODE_FALSE BUILD_DATE DIX_CFLAGS libdir exec_prefix prefix APP_MAN_SUFFIX LIB_MAN_SUFFIX FILE_MAN_SUFFIX MISC_MAN_SUFFIX DRIVER_MAN_SUFFIX ADMIN_MAN_SUFFIX APP_MAN_DIR LIB_MAN_DIR FILE_MAN_DIR MISC_MAN_DIR DRIVER_MAN_DIR ADMIN_MAN_DIR LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -23969,6 +23969,314 @@ _ACEOF
fi
+if test "${ac_cv_header_machine_apmvar_h+set}" = set; then
+ echo "$as_me:$LINENO: checking for machine/apmvar.h" >&5
+echo $ECHO_N "checking for machine/apmvar.h... $ECHO_C" >&6
+if test "${ac_cv_header_machine_apmvar_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_machine_apmvar_h" >&5
+echo "${ECHO_T}$ac_cv_header_machine_apmvar_h" >&6
+else
+ # Is the header compilable?
+echo "$as_me:$LINENO: checking machine/apmvar.h usability" >&5
+echo $ECHO_N "checking machine/apmvar.h usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <machine/apmvar.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_header_compiler=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
+
+# Is the header present?
+echo "$as_me:$LINENO: checking machine/apmvar.h presence" >&5
+echo $ECHO_N "checking machine/apmvar.h presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <machine/apmvar.h>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+ ac_header_preproc=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { echo "$as_me:$LINENO: WARNING: machine/apmvar.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: machine/apmvar.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: machine/apmvar.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: machine/apmvar.h: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { echo "$as_me:$LINENO: WARNING: machine/apmvar.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: machine/apmvar.h: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: machine/apmvar.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: machine/apmvar.h: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: machine/apmvar.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: machine/apmvar.h: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: machine/apmvar.h: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: machine/apmvar.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: machine/apmvar.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: machine/apmvar.h: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: machine/apmvar.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: machine/apmvar.h: in the future, the compiler will take precedence" >&2;}
+ (
+ cat <<\_ASBOX
+## ---------------------------------------------------------------------- ##
+## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ##
+## ---------------------------------------------------------------------- ##
+_ASBOX
+ ) |
+ sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+echo "$as_me:$LINENO: checking for machine/apmvar.h" >&5
+echo $ECHO_N "checking for machine/apmvar.h... $ECHO_C" >&6
+if test "${ac_cv_header_machine_apmvar_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_cv_header_machine_apmvar_h=$ac_header_preproc
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_machine_apmvar_h" >&5
+echo "${ECHO_T}$ac_cv_header_machine_apmvar_h" >&6
+
+fi
+if test $ac_cv_header_machine_apmvar_h = yes; then
+
+ if test "${ac_cv_header_sys_event_h+set}" = set; then
+ echo "$as_me:$LINENO: checking for sys/event.h" >&5
+echo $ECHO_N "checking for sys/event.h... $ECHO_C" >&6
+if test "${ac_cv_header_sys_event_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_sys_event_h" >&5
+echo "${ECHO_T}$ac_cv_header_sys_event_h" >&6
+else
+ # Is the header compilable?
+echo "$as_me:$LINENO: checking sys/event.h usability" >&5
+echo $ECHO_N "checking sys/event.h usability... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+$ac_includes_default
+#include <sys/event.h>
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_header_compiler=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_header_compiler=no
+fi
+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
+echo "${ECHO_T}$ac_header_compiler" >&6
+
+# Is the header present?
+echo "$as_me:$LINENO: checking sys/event.h presence" >&5
+echo $ECHO_N "checking sys/event.h presence... $ECHO_C" >&6
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <sys/event.h>
+_ACEOF
+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
+ else
+ ac_cpp_err=
+ fi
+else
+ ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+ ac_header_preproc=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_header_preproc=no
+fi
+rm -f conftest.err conftest.$ac_ext
+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
+echo "${ECHO_T}$ac_header_preproc" >&6
+
+# So? What about this header?
+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
+ yes:no: )
+ { echo "$as_me:$LINENO: WARNING: sys/event.h: accepted by the compiler, rejected by the preprocessor!" >&5
+echo "$as_me: WARNING: sys/event.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
+ { echo "$as_me:$LINENO: WARNING: sys/event.h: proceeding with the compiler's result" >&5
+echo "$as_me: WARNING: sys/event.h: proceeding with the compiler's result" >&2;}
+ ac_header_preproc=yes
+ ;;
+ no:yes:* )
+ { echo "$as_me:$LINENO: WARNING: sys/event.h: present but cannot be compiled" >&5
+echo "$as_me: WARNING: sys/event.h: present but cannot be compiled" >&2;}
+ { echo "$as_me:$LINENO: WARNING: sys/event.h: check for missing prerequisite headers?" >&5
+echo "$as_me: WARNING: sys/event.h: check for missing prerequisite headers?" >&2;}
+ { echo "$as_me:$LINENO: WARNING: sys/event.h: see the Autoconf documentation" >&5
+echo "$as_me: WARNING: sys/event.h: see the Autoconf documentation" >&2;}
+ { echo "$as_me:$LINENO: WARNING: sys/event.h: section \"Present But Cannot Be Compiled\"" >&5
+echo "$as_me: WARNING: sys/event.h: section \"Present But Cannot Be Compiled\"" >&2;}
+ { echo "$as_me:$LINENO: WARNING: sys/event.h: proceeding with the preprocessor's result" >&5
+echo "$as_me: WARNING: sys/event.h: proceeding with the preprocessor's result" >&2;}
+ { echo "$as_me:$LINENO: WARNING: sys/event.h: in the future, the compiler will take precedence" >&5
+echo "$as_me: WARNING: sys/event.h: in the future, the compiler will take precedence" >&2;}
+ (
+ cat <<\_ASBOX
+## ---------------------------------------------------------------------- ##
+## Report this to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg ##
+## ---------------------------------------------------------------------- ##
+_ASBOX
+ ) |
+ sed "s/^/$as_me: WARNING: /" >&2
+ ;;
+esac
+echo "$as_me:$LINENO: checking for sys/event.h" >&5
+echo $ECHO_N "checking for sys/event.h... $ECHO_C" >&6
+if test "${ac_cv_header_sys_event_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ ac_cv_header_sys_event_h=$ac_header_preproc
+fi
+echo "$as_me:$LINENO: result: $ac_cv_header_sys_event_h" >&5
+echo "${ECHO_T}$ac_cv_header_sys_event_h" >&6
+
+fi
+if test $ac_cv_header_sys_event_h = yes; then
+ ac_cv_BSD_KQUEUE_APM=yes
+else
+ ac_cv_BSD_APM=yes
+fi
+
+
+fi
+
+
+
+
+
+if test "x$ac_cv_BSD_APM" = xyes; then
+ BSD_APM_TRUE=
+ BSD_APM_FALSE='#'
+else
+ BSD_APM_TRUE='#'
+ BSD_APM_FALSE=
+fi
+
+
+
+if test "x$ac_cv_BSD_KQUEUE_APM" = xyes; then
+ BSD_KQUEUE_APM_TRUE=
+ BSD_KQUEUE_APM_FALSE='#'
+else
+ BSD_KQUEUE_APM_TRUE='#'
+ BSD_KQUEUE_APM_FALSE=
+fi
+
+
if test "${ac_cv_header_execinfo_h+set}" = set; then
echo "$as_me:$LINENO: checking for execinfo.h" >&5
echo $ECHO_N "checking for execinfo.h... $ECHO_C" >&6
@@ -30659,6 +30967,10 @@ _ACEOF
esac
;;
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_SUBDIR="bsd"
XORG_OS_KBD="BSD"
@@ -33936,6 +34248,20 @@ echo "$as_me: error: conditional \"FREEBSD_KLDLOAD\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
+if test -z "${BSD_APM_TRUE}" && test -z "${BSD_APM_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"BSD_APM\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"BSD_APM\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
+if test -z "${BSD_KQUEUE_APM_TRUE}" && test -z "${BSD_KQUEUE_APM_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"BSD_KQUEUE_APM\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"BSD_KQUEUE_APM\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
if test -z "${ALPHA_VIDEO_TRUE}" && test -z "${ALPHA_VIDEO_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"ALPHA_VIDEO\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
@@ -35425,6 +35751,10 @@ s,@FBDEVHW_TRUE@,$FBDEVHW_TRUE,;t t
s,@FBDEVHW_FALSE@,$FBDEVHW_FALSE,;t t
s,@FREEBSD_KLDLOAD_TRUE@,$FREEBSD_KLDLOAD_TRUE,;t t
s,@FREEBSD_KLDLOAD_FALSE@,$FREEBSD_KLDLOAD_FALSE,;t t
+s,@BSD_APM_TRUE@,$BSD_APM_TRUE,;t t
+s,@BSD_APM_FALSE@,$BSD_APM_FALSE,;t t
+s,@BSD_KQUEUE_APM_TRUE@,$BSD_KQUEUE_APM_TRUE,;t t
+s,@BSD_KQUEUE_APM_FALSE@,$BSD_KQUEUE_APM_FALSE,;t t
s,@ALPHA_VIDEO_TRUE@,$ALPHA_VIDEO_TRUE,;t t
s,@ALPHA_VIDEO_FALSE@,$ALPHA_VIDEO_FALSE,;t t
s,@ARM_VIDEO_TRUE@,$ARM_VIDEO_TRUE,;t t
diff --git a/xserver/damageext/Makefile.in b/xserver/damageext/Makefile.in
index 510563c43..23f704476 100644
--- a/xserver/damageext/Makefile.in
+++ b/xserver/damageext/Makefile.in
@@ -102,8 +102,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/dbe/Makefile.in b/xserver/dbe/Makefile.in
index 45c6b2ef7..3abe486ef 100644
--- a/xserver/dbe/Makefile.in
+++ b/xserver/dbe/Makefile.in
@@ -114,8 +114,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/dix/Makefile.in b/xserver/dix/Makefile.in
index 6ac3eb276..d1ca5a331 100644
--- a/xserver/dix/Makefile.in
+++ b/xserver/dix/Makefile.in
@@ -109,8 +109,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/doc/Makefile.in b/xserver/doc/Makefile.in
index 1684b2dda..0db76bbd6 100644
--- a/xserver/doc/Makefile.in
+++ b/xserver/doc/Makefile.in
@@ -99,8 +99,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/exa/Makefile.in b/xserver/exa/Makefile.in
index cc4c82b82..fbd422066 100644
--- a/xserver/exa/Makefile.in
+++ b/xserver/exa/Makefile.in
@@ -115,8 +115,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/fb/Makefile.in b/xserver/fb/Makefile.in
index f69d4a88f..61b173719 100644
--- a/xserver/fb/Makefile.in
+++ b/xserver/fb/Makefile.in
@@ -124,8 +124,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/Makefile.in b/xserver/hw/Makefile.in
index 9680e1426..cf8865a12 100644
--- a/xserver/hw/Makefile.in
+++ b/xserver/hw/Makefile.in
@@ -92,8 +92,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/darwin/Makefile.in b/xserver/hw/darwin/Makefile.in
index ec46ff3a4..78be5f21c 100644
--- a/xserver/hw/darwin/Makefile.in
+++ b/xserver/hw/darwin/Makefile.in
@@ -84,8 +84,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/dmx/Makefile.in b/xserver/hw/dmx/Makefile.in
index 99e0a1a00..fa7a4d28e 100644
--- a/xserver/hw/dmx/Makefile.in
+++ b/xserver/hw/dmx/Makefile.in
@@ -151,8 +151,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/dmx/config/Makefile.in b/xserver/hw/dmx/config/Makefile.in
index ea38f95ce..8ce6befe9 100644
--- a/xserver/hw/dmx/config/Makefile.in
+++ b/xserver/hw/dmx/config/Makefile.in
@@ -135,8 +135,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/dmx/doc/Makefile.in b/xserver/hw/dmx/doc/Makefile.in
index 205a4f8bf..681836851 100644
--- a/xserver/hw/dmx/doc/Makefile.in
+++ b/xserver/hw/dmx/doc/Makefile.in
@@ -107,8 +107,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/dmx/examples/Makefile.in b/xserver/hw/dmx/examples/Makefile.in
index 0f5445160..31400ef80 100644
--- a/xserver/hw/dmx/examples/Makefile.in
+++ b/xserver/hw/dmx/examples/Makefile.in
@@ -162,8 +162,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/dmx/glxProxy/Makefile.in b/xserver/hw/dmx/glxProxy/Makefile.in
index bae783a22..ac7619947 100644
--- a/xserver/hw/dmx/glxProxy/Makefile.in
+++ b/xserver/hw/dmx/glxProxy/Makefile.in
@@ -110,8 +110,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/dmx/input/Makefile.in b/xserver/hw/dmx/input/Makefile.in
index d73e0fc15..83c9ab464 100644
--- a/xserver/hw/dmx/input/Makefile.in
+++ b/xserver/hw/dmx/input/Makefile.in
@@ -124,8 +124,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/kdrive/Makefile.in b/xserver/hw/kdrive/Makefile.in
index 46c3aa9a4..92a266538 100644
--- a/xserver/hw/kdrive/Makefile.in
+++ b/xserver/hw/kdrive/Makefile.in
@@ -92,8 +92,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/kdrive/ati/Makefile.in b/xserver/hw/kdrive/ati/Makefile.in
index 7a3ae059c..7672dc9a1 100644
--- a/xserver/hw/kdrive/ati/Makefile.in
+++ b/xserver/hw/kdrive/ati/Makefile.in
@@ -134,8 +134,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/kdrive/chips/Makefile.in b/xserver/hw/kdrive/chips/Makefile.in
index bbce6db57..9edb2562c 100644
--- a/xserver/hw/kdrive/chips/Makefile.in
+++ b/xserver/hw/kdrive/chips/Makefile.in
@@ -113,8 +113,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/kdrive/ephyr/Makefile.in b/xserver/hw/kdrive/ephyr/Makefile.in
index e17b4a86f..fbd025017 100644
--- a/xserver/hw/kdrive/ephyr/Makefile.in
+++ b/xserver/hw/kdrive/ephyr/Makefile.in
@@ -118,8 +118,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/kdrive/epson/Makefile.in b/xserver/hw/kdrive/epson/Makefile.in
index 975cc48f0..fad3496b1 100644
--- a/xserver/hw/kdrive/epson/Makefile.in
+++ b/xserver/hw/kdrive/epson/Makefile.in
@@ -112,8 +112,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/kdrive/fake/Makefile.in b/xserver/hw/kdrive/fake/Makefile.in
index 5b59f884d..7dfce8df0 100644
--- a/xserver/hw/kdrive/fake/Makefile.in
+++ b/xserver/hw/kdrive/fake/Makefile.in
@@ -113,8 +113,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/kdrive/fbdev/Makefile.in b/xserver/hw/kdrive/fbdev/Makefile.in
index 6f60db54c..5febf3ba7 100644
--- a/xserver/hw/kdrive/fbdev/Makefile.in
+++ b/xserver/hw/kdrive/fbdev/Makefile.in
@@ -111,8 +111,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/kdrive/i810/Makefile.in b/xserver/hw/kdrive/i810/Makefile.in
index aa481d461..39e83e896 100644
--- a/xserver/hw/kdrive/i810/Makefile.in
+++ b/xserver/hw/kdrive/i810/Makefile.in
@@ -113,8 +113,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/kdrive/linux/Makefile.in b/xserver/hw/kdrive/linux/Makefile.in
index fbf7d2767..98527a398 100644
--- a/xserver/hw/kdrive/linux/Makefile.in
+++ b/xserver/hw/kdrive/linux/Makefile.in
@@ -112,8 +112,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/kdrive/mach64/Makefile.in b/xserver/hw/kdrive/mach64/Makefile.in
index bbe1244a5..f5e0b2955 100644
--- a/xserver/hw/kdrive/mach64/Makefile.in
+++ b/xserver/hw/kdrive/mach64/Makefile.in
@@ -115,8 +115,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/kdrive/mga/Makefile.in b/xserver/hw/kdrive/mga/Makefile.in
index fa55ff184..049d16e37 100644
--- a/xserver/hw/kdrive/mga/Makefile.in
+++ b/xserver/hw/kdrive/mga/Makefile.in
@@ -114,8 +114,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/kdrive/neomagic/Makefile.in b/xserver/hw/kdrive/neomagic/Makefile.in
index e64897048..a8078166b 100644
--- a/xserver/hw/kdrive/neomagic/Makefile.in
+++ b/xserver/hw/kdrive/neomagic/Makefile.in
@@ -119,8 +119,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/kdrive/nvidia/Makefile.in b/xserver/hw/kdrive/nvidia/Makefile.in
index ef448070c..8863cafbe 100644
--- a/xserver/hw/kdrive/nvidia/Makefile.in
+++ b/xserver/hw/kdrive/nvidia/Makefile.in
@@ -113,8 +113,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/kdrive/pm2/Makefile.in b/xserver/hw/kdrive/pm2/Makefile.in
index 27a6959b9..df44dfba7 100644
--- a/xserver/hw/kdrive/pm2/Makefile.in
+++ b/xserver/hw/kdrive/pm2/Makefile.in
@@ -112,8 +112,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/kdrive/r128/Makefile.in b/xserver/hw/kdrive/r128/Makefile.in
index c6dedfe84..8bdafa864 100644
--- a/xserver/hw/kdrive/r128/Makefile.in
+++ b/xserver/hw/kdrive/r128/Makefile.in
@@ -113,8 +113,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/kdrive/sdl/Makefile.in b/xserver/hw/kdrive/sdl/Makefile.in
index 1c8fd9586..2eb0593a1 100644
--- a/xserver/hw/kdrive/sdl/Makefile.in
+++ b/xserver/hw/kdrive/sdl/Makefile.in
@@ -106,8 +106,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/kdrive/sis300/Makefile.in b/xserver/hw/kdrive/sis300/Makefile.in
index c949f61c3..3eaeae744 100644
--- a/xserver/hw/kdrive/sis300/Makefile.in
+++ b/xserver/hw/kdrive/sis300/Makefile.in
@@ -118,8 +118,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/kdrive/smi/Makefile.in b/xserver/hw/kdrive/smi/Makefile.in
index a918eb19b..efa4dc285 100644
--- a/xserver/hw/kdrive/smi/Makefile.in
+++ b/xserver/hw/kdrive/smi/Makefile.in
@@ -114,8 +114,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/kdrive/src/Makefile.in b/xserver/hw/kdrive/src/Makefile.in
index df55576cc..d1a8a62a9 100644
--- a/xserver/hw/kdrive/src/Makefile.in
+++ b/xserver/hw/kdrive/src/Makefile.in
@@ -119,8 +119,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/kdrive/vesa/Makefile.in b/xserver/hw/kdrive/vesa/Makefile.in
index 58287fb5a..327ba70c0 100644
--- a/xserver/hw/kdrive/vesa/Makefile.in
+++ b/xserver/hw/kdrive/vesa/Makefile.in
@@ -112,8 +112,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/kdrive/via/Makefile.in b/xserver/hw/kdrive/via/Makefile.in
index b7b837d2d..02a00b6d4 100644
--- a/xserver/hw/kdrive/via/Makefile.in
+++ b/xserver/hw/kdrive/via/Makefile.in
@@ -113,8 +113,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/vfb/Makefile.in b/xserver/hw/vfb/Makefile.in
index c0935dd33..34da4494b 100644
--- a/xserver/hw/vfb/Makefile.in
+++ b/xserver/hw/vfb/Makefile.in
@@ -124,8 +124,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xfree86/Makefile.in b/xserver/hw/xfree86/Makefile.in
index 0f9c1ed72..cc82a4bcf 100644
--- a/xserver/hw/xfree86/Makefile.in
+++ b/xserver/hw/xfree86/Makefile.in
@@ -137,8 +137,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xfree86/common/Makefile.in b/xserver/hw/xfree86/common/Makefile.in
index c374e3564..c13b2303f 100644
--- a/xserver/hw/xfree86/common/Makefile.in
+++ b/xserver/hw/xfree86/common/Makefile.in
@@ -154,8 +154,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xfree86/ddc/Makefile.in b/xserver/hw/xfree86/ddc/Makefile.in
index a489dd101..1139cd91e 100644
--- a/xserver/hw/xfree86/ddc/Makefile.in
+++ b/xserver/hw/xfree86/ddc/Makefile.in
@@ -115,8 +115,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xfree86/dixmods/Makefile.in b/xserver/hw/xfree86/dixmods/Makefile.in
index e0bae52b4..32b2c5b2c 100644
--- a/xserver/hw/xfree86/dixmods/Makefile.in
+++ b/xserver/hw/xfree86/dixmods/Makefile.in
@@ -183,8 +183,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xfree86/dixmods/extmod/Makefile.in b/xserver/hw/xfree86/dixmods/extmod/Makefile.in
index dcc4bdfa1..d5844a494 100644
--- a/xserver/hw/xfree86/dixmods/extmod/Makefile.in
+++ b/xserver/hw/xfree86/dixmods/extmod/Makefile.in
@@ -120,8 +120,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xfree86/doc/Makefile.in b/xserver/hw/xfree86/doc/Makefile.in
index 68cebaced..1d7fe0cfd 100644
--- a/xserver/hw/xfree86/doc/Makefile.in
+++ b/xserver/hw/xfree86/doc/Makefile.in
@@ -93,8 +93,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xfree86/doc/devel/Makefile.in b/xserver/hw/xfree86/doc/devel/Makefile.in
index 0cb7ebfed..0fa6a9064 100644
--- a/xserver/hw/xfree86/doc/devel/Makefile.in
+++ b/xserver/hw/xfree86/doc/devel/Makefile.in
@@ -87,8 +87,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xfree86/doc/man/Makefile.in b/xserver/hw/xfree86/doc/man/Makefile.in
index 1176fa9e4..7949a3636 100644
--- a/xserver/hw/xfree86/doc/man/Makefile.in
+++ b/xserver/hw/xfree86/doc/man/Makefile.in
@@ -100,8 +100,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xfree86/doc/sgml/Makefile.in b/xserver/hw/xfree86/doc/sgml/Makefile.in
index 3e81b659b..0039df34a 100644
--- a/xserver/hw/xfree86/doc/sgml/Makefile.in
+++ b/xserver/hw/xfree86/doc/sgml/Makefile.in
@@ -107,8 +107,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xfree86/dri/Makefile.in b/xserver/hw/xfree86/dri/Makefile.in
index 3dac659d5..c1a4680a1 100644
--- a/xserver/hw/xfree86/dri/Makefile.in
+++ b/xserver/hw/xfree86/dri/Makefile.in
@@ -115,8 +115,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xfree86/dummylib/Makefile.in b/xserver/hw/xfree86/dummylib/Makefile.in
index a799a4edd..bdafd7b48 100644
--- a/xserver/hw/xfree86/dummylib/Makefile.in
+++ b/xserver/hw/xfree86/dummylib/Makefile.in
@@ -130,8 +130,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xfree86/exa/Makefile.in b/xserver/hw/xfree86/exa/Makefile.in
index 9c5b52228..15566dc27 100644
--- a/xserver/hw/xfree86/exa/Makefile.in
+++ b/xserver/hw/xfree86/exa/Makefile.in
@@ -118,8 +118,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xfree86/fbdevhw/Makefile.in b/xserver/hw/xfree86/fbdevhw/Makefile.in
index 96f20db2d..9e49edfc8 100644
--- a/xserver/hw/xfree86/fbdevhw/Makefile.in
+++ b/xserver/hw/xfree86/fbdevhw/Makefile.in
@@ -124,8 +124,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xfree86/i2c/Makefile.in b/xserver/hw/xfree86/i2c/Makefile.in
index 01bccac1f..c00013d43 100644
--- a/xserver/hw/xfree86/i2c/Makefile.in
+++ b/xserver/hw/xfree86/i2c/Makefile.in
@@ -143,8 +143,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xfree86/int10/Makefile.in b/xserver/hw/xfree86/int10/Makefile.in
index 4d0c34c27..41d68a6dc 100644
--- a/xserver/hw/xfree86/int10/Makefile.in
+++ b/xserver/hw/xfree86/int10/Makefile.in
@@ -128,8 +128,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xfree86/loader/Makefile.in b/xserver/hw/xfree86/loader/Makefile.in
index 2fb0933ed..badab70fe 100644
--- a/xserver/hw/xfree86/loader/Makefile.in
+++ b/xserver/hw/xfree86/loader/Makefile.in
@@ -115,8 +115,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xfree86/os-support/Makefile.in b/xserver/hw/xfree86/os-support/Makefile.in
index cafa989cf..316c166ea 100644
--- a/xserver/hw/xfree86/os-support/Makefile.in
+++ b/xserver/hw/xfree86/os-support/Makefile.in
@@ -120,8 +120,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xfree86/os-support/bsd/Makefile.in b/xserver/hw/xfree86/os-support/bsd/Makefile.in
index 63b69a04e..ef9bae828 100644
--- a/xserver/hw/xfree86/os-support/bsd/Makefile.in
+++ b/xserver/hw/xfree86/os-support/bsd/Makefile.in
@@ -65,7 +65,8 @@ am__libbsd_la_SOURCES_DIST = $(srcdir)/../shared/at_scancode.c \
$(srcdir)/../shared/ioperm_noop.c hp300_video.c hppa_video.c \
i386_video.c ppc_video.c sparc64_video.c \
$(srcdir)/../shared/agp_noop.c bsd_agp.c \
- $(srcdir)/../shared/pm_noop.c $(srcdir)/../shared/kmod_noop.c \
+ $(srcdir)/../shared/pm_noop.c $(srcdir)/bsd_apm.c \
+ $(srcdir)/bsd_kqueue_apm.c $(srcdir)/../shared/kmod_noop.c \
bsd_kmod.c $(srcdir)/../shared/stdResource.c
@ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@HP300_VIDEO_FALSE@@HPPA_VIDEO_FALSE@@I386_VIDEO_FALSE@@PPC_VIDEO_FALSE@@SPARC64_VIDEO_TRUE@am__objects_1 = sparc64_video.lo \
@ALPHA_VIDEO_FALSE@@ARM_VIDEO_FALSE@@HP300_VIDEO_FALSE@@HPPA_VIDEO_FALSE@@I386_VIDEO_FALSE@@PPC_VIDEO_FALSE@@SPARC64_VIDEO_TRUE@ ioperm_noop.lo
@@ -80,7 +81,9 @@ am__libbsd_la_SOURCES_DIST = $(srcdir)/../shared/at_scancode.c \
@ALPHA_VIDEO_TRUE@ bsd_axp.lo xf86Axp.lo
@AGP_FALSE@am__objects_2 = agp_noop.lo
@AGP_TRUE@am__objects_2 = bsd_agp.lo
-am__objects_3 = pm_noop.lo
+@BSD_APM_FALSE@@BSD_KQUEUE_APM_FALSE@am__objects_3 = pm_noop.lo
+@BSD_APM_TRUE@@BSD_KQUEUE_APM_FALSE@am__objects_3 = bsd_apm.lo
+@BSD_KQUEUE_APM_TRUE@am__objects_3 = bsd_kqueue_apm.lo
@FREEBSD_KLDLOAD_FALSE@am__objects_4 = kmod_noop.lo
@FREEBSD_KLDLOAD_TRUE@am__objects_4 = bsd_kmod.lo
am__objects_5 = stdResource.lo
@@ -135,8 +138,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
@@ -568,11 +575,13 @@ target_alias = @target_alias@
xglmoduledir = @xglmoduledir@
xpconfigdir = @xpconfigdir@
noinst_LTLIBRARIES = libbsd.la
+@BSD_APM_FALSE@@BSD_KQUEUE_APM_FALSE@APM_SOURCES = $(srcdir)/../shared/pm_noop.c
+@BSD_APM_TRUE@@BSD_KQUEUE_APM_FALSE@APM_SOURCES = $(srcdir)/bsd_apm.c
# FIXME: Add USB mouse support?
-# FIXME: APM support.
-APM_SOURCES = $(srcdir)/../shared/pm_noop.c
+# APM support.
+@BSD_KQUEUE_APM_TRUE@APM_SOURCES = $(srcdir)/bsd_kqueue_apm.c
@FREEBSD_KLDLOAD_FALSE@KMOD_SOURCES = $(srcdir)/../shared/kmod_noop.c
@FREEBSD_KLDLOAD_TRUE@KMOD_SOURCES = bsd_kmod.c
@@ -704,12 +713,14 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bsd_KbdMap.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bsd_VTsw.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bsd_agp.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bsd_apm.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bsd_axp.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bsd_ev56.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bsd_init.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bsd_io.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bsd_kbd.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bsd_kmod.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bsd_kqueue_apm.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bsd_mouse.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hp300_video.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hppa_video.Plo@am__quote@
@@ -826,6 +837,20 @@ pm_noop.lo: $(srcdir)/../shared/pm_noop.c
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o pm_noop.lo `test -f '$(srcdir)/../shared/pm_noop.c' || echo '$(srcdir)/'`$(srcdir)/../shared/pm_noop.c
+bsd_apm.lo: $(srcdir)/bsd_apm.c
+@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT bsd_apm.lo -MD -MP -MF "$(DEPDIR)/bsd_apm.Tpo" -c -o bsd_apm.lo `test -f '$(srcdir)/bsd_apm.c' || echo '$(srcdir)/'`$(srcdir)/bsd_apm.c; \
+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/bsd_apm.Tpo" "$(DEPDIR)/bsd_apm.Plo"; else rm -f "$(DEPDIR)/bsd_apm.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/bsd_apm.c' object='bsd_apm.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o bsd_apm.lo `test -f '$(srcdir)/bsd_apm.c' || echo '$(srcdir)/'`$(srcdir)/bsd_apm.c
+
+bsd_kqueue_apm.lo: $(srcdir)/bsd_kqueue_apm.c
+@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT bsd_kqueue_apm.lo -MD -MP -MF "$(DEPDIR)/bsd_kqueue_apm.Tpo" -c -o bsd_kqueue_apm.lo `test -f '$(srcdir)/bsd_kqueue_apm.c' || echo '$(srcdir)/'`$(srcdir)/bsd_kqueue_apm.c; \
+@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/bsd_kqueue_apm.Tpo" "$(DEPDIR)/bsd_kqueue_apm.Plo"; else rm -f "$(DEPDIR)/bsd_kqueue_apm.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(srcdir)/bsd_kqueue_apm.c' object='bsd_kqueue_apm.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o bsd_kqueue_apm.lo `test -f '$(srcdir)/bsd_kqueue_apm.c' || echo '$(srcdir)/'`$(srcdir)/bsd_kqueue_apm.c
+
kmod_noop.lo: $(srcdir)/../shared/kmod_noop.c
@am__fastdepCC_TRUE@ if $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT kmod_noop.lo -MD -MP -MF "$(DEPDIR)/kmod_noop.Tpo" -c -o kmod_noop.lo `test -f '$(srcdir)/../shared/kmod_noop.c' || echo '$(srcdir)/'`$(srcdir)/../shared/kmod_noop.c; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/kmod_noop.Tpo" "$(DEPDIR)/kmod_noop.Plo"; else rm -f "$(DEPDIR)/kmod_noop.Tpo"; exit 1; fi
diff --git a/xserver/hw/xfree86/os-support/bus/Makefile.in b/xserver/hw/xfree86/os-support/bus/Makefile.in
index 3e3748f96..e14dc3324 100644
--- a/xserver/hw/xfree86/os-support/bus/Makefile.in
+++ b/xserver/hw/xfree86/os-support/bus/Makefile.in
@@ -140,8 +140,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xfree86/os-support/hurd/Makefile.in b/xserver/hw/xfree86/os-support/hurd/Makefile.in
index 82bd3b345..e0c9b8eb0 100644
--- a/xserver/hw/xfree86/os-support/hurd/Makefile.in
+++ b/xserver/hw/xfree86/os-support/hurd/Makefile.in
@@ -105,8 +105,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xfree86/os-support/linux/Makefile.in b/xserver/hw/xfree86/os-support/linux/Makefile.in
index 63ef9cd50..3c0d03dae 100644
--- a/xserver/hw/xfree86/os-support/linux/Makefile.in
+++ b/xserver/hw/xfree86/os-support/linux/Makefile.in
@@ -123,8 +123,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xfree86/os-support/lynxos/Makefile.in b/xserver/hw/xfree86/os-support/lynxos/Makefile.in
index 9b1e65759..5b8dd63cb 100644
--- a/xserver/hw/xfree86/os-support/lynxos/Makefile.in
+++ b/xserver/hw/xfree86/os-support/lynxos/Makefile.in
@@ -84,8 +84,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xfree86/os-support/misc/Makefile.in b/xserver/hw/xfree86/os-support/misc/Makefile.in
index a4cb4a69c..50ed24f9d 100644
--- a/xserver/hw/xfree86/os-support/misc/Makefile.in
+++ b/xserver/hw/xfree86/os-support/misc/Makefile.in
@@ -104,8 +104,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xfree86/os-support/sco/Makefile.in b/xserver/hw/xfree86/os-support/sco/Makefile.in
index 0e51f7019..f13e9a73e 100644
--- a/xserver/hw/xfree86/os-support/sco/Makefile.in
+++ b/xserver/hw/xfree86/os-support/sco/Makefile.in
@@ -84,8 +84,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xfree86/os-support/solaris/Makefile.in b/xserver/hw/xfree86/os-support/solaris/Makefile.in
index 64280a497..c5c3a4d4c 100644
--- a/xserver/hw/xfree86/os-support/solaris/Makefile.in
+++ b/xserver/hw/xfree86/os-support/solaris/Makefile.in
@@ -140,8 +140,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xfree86/os-support/sysv/Makefile.in b/xserver/hw/xfree86/os-support/sysv/Makefile.in
index 0ec46047c..68d56a5c6 100644
--- a/xserver/hw/xfree86/os-support/sysv/Makefile.in
+++ b/xserver/hw/xfree86/os-support/sysv/Makefile.in
@@ -84,8 +84,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xfree86/os-support/usl/Makefile.in b/xserver/hw/xfree86/os-support/usl/Makefile.in
index 099e24988..be21805b1 100644
--- a/xserver/hw/xfree86/os-support/usl/Makefile.in
+++ b/xserver/hw/xfree86/os-support/usl/Makefile.in
@@ -84,8 +84,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xfree86/parser/Makefile.in b/xserver/hw/xfree86/parser/Makefile.in
index 9ccf54f4c..1af0f0daa 100644
--- a/xserver/hw/xfree86/parser/Makefile.in
+++ b/xserver/hw/xfree86/parser/Makefile.in
@@ -122,8 +122,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xfree86/rac/Makefile.in b/xserver/hw/xfree86/rac/Makefile.in
index 0ee06cb1b..49c5b074d 100644
--- a/xserver/hw/xfree86/rac/Makefile.in
+++ b/xserver/hw/xfree86/rac/Makefile.in
@@ -115,8 +115,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xfree86/ramdac/Makefile.in b/xserver/hw/xfree86/ramdac/Makefile.in
index 48610bba3..e52667286 100644
--- a/xserver/hw/xfree86/ramdac/Makefile.in
+++ b/xserver/hw/xfree86/ramdac/Makefile.in
@@ -116,8 +116,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xfree86/scanpci/Makefile.in b/xserver/hw/xfree86/scanpci/Makefile.in
index 72e60e465..59031c13a 100644
--- a/xserver/hw/xfree86/scanpci/Makefile.in
+++ b/xserver/hw/xfree86/scanpci/Makefile.in
@@ -113,8 +113,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xfree86/shadowfb/Makefile.in b/xserver/hw/xfree86/shadowfb/Makefile.in
index 387b1cf03..9e5b91616 100644
--- a/xserver/hw/xfree86/shadowfb/Makefile.in
+++ b/xserver/hw/xfree86/shadowfb/Makefile.in
@@ -114,8 +114,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xfree86/utils/Makefile.in b/xserver/hw/xfree86/utils/Makefile.in
index 033a35308..4ed0be262 100644
--- a/xserver/hw/xfree86/utils/Makefile.in
+++ b/xserver/hw/xfree86/utils/Makefile.in
@@ -93,8 +93,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xfree86/utils/cvt/Makefile.in b/xserver/hw/xfree86/utils/cvt/Makefile.in
index de9849204..60c50a442 100644
--- a/xserver/hw/xfree86/utils/cvt/Makefile.in
+++ b/xserver/hw/xfree86/utils/cvt/Makefile.in
@@ -142,8 +142,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xfree86/utils/gtf/Makefile.in b/xserver/hw/xfree86/utils/gtf/Makefile.in
index 1e6f23f4e..b82bb1502 100644
--- a/xserver/hw/xfree86/utils/gtf/Makefile.in
+++ b/xserver/hw/xfree86/utils/gtf/Makefile.in
@@ -147,8 +147,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xfree86/utils/ioport/Makefile.in b/xserver/hw/xfree86/utils/ioport/Makefile.in
index 071f1a53f..645edbc45 100644
--- a/xserver/hw/xfree86/utils/ioport/Makefile.in
+++ b/xserver/hw/xfree86/utils/ioport/Makefile.in
@@ -135,8 +135,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xfree86/utils/kbd_mode/Makefile.in b/xserver/hw/xfree86/utils/kbd_mode/Makefile.in
index c916c0708..05de1839e 100644
--- a/xserver/hw/xfree86/utils/kbd_mode/Makefile.in
+++ b/xserver/hw/xfree86/utils/kbd_mode/Makefile.in
@@ -150,8 +150,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xfree86/utils/pcitweak/Makefile.in b/xserver/hw/xfree86/utils/pcitweak/Makefile.in
index 20353c2c4..f6998d76f 100644
--- a/xserver/hw/xfree86/utils/pcitweak/Makefile.in
+++ b/xserver/hw/xfree86/utils/pcitweak/Makefile.in
@@ -149,8 +149,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xfree86/utils/scanpci/Makefile.in b/xserver/hw/xfree86/utils/scanpci/Makefile.in
index 092bd686a..55c664440 100644
--- a/xserver/hw/xfree86/utils/scanpci/Makefile.in
+++ b/xserver/hw/xfree86/utils/scanpci/Makefile.in
@@ -150,8 +150,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xfree86/utils/xorgcfg/Makefile.in b/xserver/hw/xfree86/utils/xorgcfg/Makefile.in
index b9c971423..2c33f82a2 100644
--- a/xserver/hw/xfree86/utils/xorgcfg/Makefile.in
+++ b/xserver/hw/xfree86/utils/xorgcfg/Makefile.in
@@ -185,8 +185,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xfree86/utils/xorgconfig/Makefile.in b/xserver/hw/xfree86/utils/xorgconfig/Makefile.in
index 5986b21e0..9657f42da 100644
--- a/xserver/hw/xfree86/utils/xorgconfig/Makefile.in
+++ b/xserver/hw/xfree86/utils/xorgconfig/Makefile.in
@@ -150,8 +150,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xfree86/vbe/Makefile.in b/xserver/hw/xfree86/vbe/Makefile.in
index 33fae9bb3..c51b06356 100644
--- a/xserver/hw/xfree86/vbe/Makefile.in
+++ b/xserver/hw/xfree86/vbe/Makefile.in
@@ -114,8 +114,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xfree86/vgahw/Makefile.in b/xserver/hw/xfree86/vgahw/Makefile.in
index 0a353ca55..747a00e7b 100644
--- a/xserver/hw/xfree86/vgahw/Makefile.in
+++ b/xserver/hw/xfree86/vgahw/Makefile.in
@@ -114,8 +114,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xfree86/x86emu/Makefile.in b/xserver/hw/xfree86/x86emu/Makefile.in
index 68a69871f..0a3f884dc 100644
--- a/xserver/hw/xfree86/x86emu/Makefile.in
+++ b/xserver/hw/xfree86/x86emu/Makefile.in
@@ -106,8 +106,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xfree86/xaa/Makefile.in b/xserver/hw/xfree86/xaa/Makefile.in
index 83c897d9a..972b0af18 100644
--- a/xserver/hw/xfree86/xaa/Makefile.in
+++ b/xserver/hw/xfree86/xaa/Makefile.in
@@ -133,8 +133,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xfree86/xf1bpp/Makefile.in b/xserver/hw/xfree86/xf1bpp/Makefile.in
index d0e5dd130..20a9823b2 100644
--- a/xserver/hw/xfree86/xf1bpp/Makefile.in
+++ b/xserver/hw/xfree86/xf1bpp/Makefile.in
@@ -125,8 +125,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xfree86/xf4bpp/Makefile.in b/xserver/hw/xfree86/xf4bpp/Makefile.in
index 5890cca3a..9ac0e47d1 100644
--- a/xserver/hw/xfree86/xf4bpp/Makefile.in
+++ b/xserver/hw/xfree86/xf4bpp/Makefile.in
@@ -122,8 +122,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xfree86/xf8_16bpp/Makefile.in b/xserver/hw/xfree86/xf8_16bpp/Makefile.in
index 7ad3e49b8..1542143f2 100644
--- a/xserver/hw/xfree86/xf8_16bpp/Makefile.in
+++ b/xserver/hw/xfree86/xf8_16bpp/Makefile.in
@@ -114,8 +114,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xfree86/xf8_32bpp/Makefile.in b/xserver/hw/xfree86/xf8_32bpp/Makefile.in
index 26840ea37..270c9569c 100644
--- a/xserver/hw/xfree86/xf8_32bpp/Makefile.in
+++ b/xserver/hw/xfree86/xf8_32bpp/Makefile.in
@@ -117,8 +117,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xgl/Makefile.in b/xserver/hw/xgl/Makefile.in
index 39dd64264..fd8b4b8ed 100644
--- a/xserver/hw/xgl/Makefile.in
+++ b/xserver/hw/xgl/Makefile.in
@@ -130,8 +130,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xgl/egl/Makefile.in b/xserver/hw/xgl/egl/Makefile.in
index 6094b118c..db26cd97c 100644
--- a/xserver/hw/xgl/egl/Makefile.in
+++ b/xserver/hw/xgl/egl/Makefile.in
@@ -118,8 +118,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xgl/egl/module/Makefile.in b/xserver/hw/xgl/egl/module/Makefile.in
index 8d6fdf1c4..fe6366be0 100644
--- a/xserver/hw/xgl/egl/module/Makefile.in
+++ b/xserver/hw/xgl/egl/module/Makefile.in
@@ -112,8 +112,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xgl/glx/Makefile.in b/xserver/hw/xgl/glx/Makefile.in
index 558c66300..44832b39d 100644
--- a/xserver/hw/xgl/glx/Makefile.in
+++ b/xserver/hw/xgl/glx/Makefile.in
@@ -108,8 +108,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xgl/glx/module/Makefile.in b/xserver/hw/xgl/glx/module/Makefile.in
index 6bb5fc7e0..75d7c2cd5 100644
--- a/xserver/hw/xgl/glx/module/Makefile.in
+++ b/xserver/hw/xgl/glx/module/Makefile.in
@@ -112,8 +112,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xgl/glxext/Makefile.in b/xserver/hw/xgl/glxext/Makefile.in
index 8db6c676d..9ee812c93 100644
--- a/xserver/hw/xgl/glxext/Makefile.in
+++ b/xserver/hw/xgl/glxext/Makefile.in
@@ -109,8 +109,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xgl/glxext/module/Makefile.in b/xserver/hw/xgl/glxext/module/Makefile.in
index 693903a18..3df00b400 100644
--- a/xserver/hw/xgl/glxext/module/Makefile.in
+++ b/xserver/hw/xgl/glxext/module/Makefile.in
@@ -113,8 +113,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xnest/Makefile.in b/xserver/hw/xnest/Makefile.in
index 00987cd7e..e0b04ca51 100644
--- a/xserver/hw/xnest/Makefile.in
+++ b/xserver/hw/xnest/Makefile.in
@@ -128,8 +128,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xprint/Makefile.in b/xserver/hw/xprint/Makefile.in
index 1f6abcd3c..ec2bda1d3 100644
--- a/xserver/hw/xprint/Makefile.in
+++ b/xserver/hw/xprint/Makefile.in
@@ -119,8 +119,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xprint/config/C/Makefile.in b/xserver/hw/xprint/config/C/Makefile.in
index b9baa5c12..8661e1147 100644
--- a/xserver/hw/xprint/config/C/Makefile.in
+++ b/xserver/hw/xprint/config/C/Makefile.in
@@ -93,8 +93,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xprint/config/C/print/Makefile.in b/xserver/hw/xprint/config/C/print/Makefile.in
index d23e44086..03bde94cb 100644
--- a/xserver/hw/xprint/config/C/print/Makefile.in
+++ b/xserver/hw/xprint/config/C/print/Makefile.in
@@ -105,8 +105,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xprint/config/C/print/attributes/Makefile.in b/xserver/hw/xprint/config/C/print/attributes/Makefile.in
index b01406545..5047c37fd 100644
--- a/xserver/hw/xprint/config/C/print/attributes/Makefile.in
+++ b/xserver/hw/xprint/config/C/print/attributes/Makefile.in
@@ -95,8 +95,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xprint/config/C/print/ddx-config/Makefile.in b/xserver/hw/xprint/config/C/print/ddx-config/Makefile.in
index 3acc799f8..08d6ddf11 100644
--- a/xserver/hw/xprint/config/C/print/ddx-config/Makefile.in
+++ b/xserver/hw/xprint/config/C/print/ddx-config/Makefile.in
@@ -93,8 +93,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xprint/config/C/print/ddx-config/raster/Makefile.in b/xserver/hw/xprint/config/C/print/ddx-config/raster/Makefile.in
index a91e5b1bc..b710fc2b6 100644
--- a/xserver/hw/xprint/config/C/print/ddx-config/raster/Makefile.in
+++ b/xserver/hw/xprint/config/C/print/ddx-config/raster/Makefile.in
@@ -95,8 +95,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xprint/config/C/print/models/CANONBJ10E-GS/Makefile.in b/xserver/hw/xprint/config/C/print/models/CANONBJ10E-GS/Makefile.in
index 40c32b109..7e46bff75 100644
--- a/xserver/hw/xprint/config/C/print/models/CANONBJ10E-GS/Makefile.in
+++ b/xserver/hw/xprint/config/C/print/models/CANONBJ10E-GS/Makefile.in
@@ -95,8 +95,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xprint/config/C/print/models/CANONC3200-PS/Makefile.in b/xserver/hw/xprint/config/C/print/models/CANONC3200-PS/Makefile.in
index c25684da3..0d2c9ddee 100644
--- a/xserver/hw/xprint/config/C/print/models/CANONC3200-PS/Makefile.in
+++ b/xserver/hw/xprint/config/C/print/models/CANONC3200-PS/Makefile.in
@@ -104,8 +104,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xprint/config/C/print/models/CANONC3200-PS/fonts/Makefile.in b/xserver/hw/xprint/config/C/print/models/CANONC3200-PS/fonts/Makefile.in
index 0f04bc9da..3c72ea9b8 100644
--- a/xserver/hw/xprint/config/C/print/models/CANONC3200-PS/fonts/Makefile.in
+++ b/xserver/hw/xprint/config/C/print/models/CANONC3200-PS/fonts/Makefile.in
@@ -84,8 +84,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xprint/config/C/print/models/GSdefault/Makefile.in b/xserver/hw/xprint/config/C/print/models/GSdefault/Makefile.in
index 781d05c18..7b1144c0d 100644
--- a/xserver/hw/xprint/config/C/print/models/GSdefault/Makefile.in
+++ b/xserver/hw/xprint/config/C/print/models/GSdefault/Makefile.in
@@ -95,8 +95,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xprint/config/C/print/models/HPDJ1600C/Makefile.in b/xserver/hw/xprint/config/C/print/models/HPDJ1600C/Makefile.in
index 01442b1e3..32a2144cc 100644
--- a/xserver/hw/xprint/config/C/print/models/HPDJ1600C/Makefile.in
+++ b/xserver/hw/xprint/config/C/print/models/HPDJ1600C/Makefile.in
@@ -104,8 +104,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xprint/config/C/print/models/HPDJ1600C/fonts/Makefile.in b/xserver/hw/xprint/config/C/print/models/HPDJ1600C/fonts/Makefile.in
index b8010f23c..713ff4090 100644
--- a/xserver/hw/xprint/config/C/print/models/HPDJ1600C/fonts/Makefile.in
+++ b/xserver/hw/xprint/config/C/print/models/HPDJ1600C/fonts/Makefile.in
@@ -95,8 +95,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xprint/config/C/print/models/HPLJ4050-PS/Makefile.in b/xserver/hw/xprint/config/C/print/models/HPLJ4050-PS/Makefile.in
index e59e20dc3..befd73cf3 100644
--- a/xserver/hw/xprint/config/C/print/models/HPLJ4050-PS/Makefile.in
+++ b/xserver/hw/xprint/config/C/print/models/HPLJ4050-PS/Makefile.in
@@ -104,8 +104,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xprint/config/C/print/models/HPLJ4050-PS/fonts/Makefile.in b/xserver/hw/xprint/config/C/print/models/HPLJ4050-PS/fonts/Makefile.in
index 3694d24dd..0c7bc01a9 100644
--- a/xserver/hw/xprint/config/C/print/models/HPLJ4050-PS/fonts/Makefile.in
+++ b/xserver/hw/xprint/config/C/print/models/HPLJ4050-PS/fonts/Makefile.in
@@ -84,8 +84,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xprint/config/C/print/models/HPLJ4family/Makefile.in b/xserver/hw/xprint/config/C/print/models/HPLJ4family/Makefile.in
index a1ca605ee..6f2246fdc 100644
--- a/xserver/hw/xprint/config/C/print/models/HPLJ4family/Makefile.in
+++ b/xserver/hw/xprint/config/C/print/models/HPLJ4family/Makefile.in
@@ -104,8 +104,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xprint/config/C/print/models/HPLJ4family/fonts/Makefile.in b/xserver/hw/xprint/config/C/print/models/HPLJ4family/fonts/Makefile.in
index 1a03ea19d..01fd4fab7 100644
--- a/xserver/hw/xprint/config/C/print/models/HPLJ4family/fonts/Makefile.in
+++ b/xserver/hw/xprint/config/C/print/models/HPLJ4family/fonts/Makefile.in
@@ -95,8 +95,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xprint/config/C/print/models/Makefile.in b/xserver/hw/xprint/config/C/print/models/Makefile.in
index eecb45831..155256884 100644
--- a/xserver/hw/xprint/config/C/print/models/Makefile.in
+++ b/xserver/hw/xprint/config/C/print/models/Makefile.in
@@ -93,8 +93,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xprint/config/C/print/models/PS2PDFspooldir-GS/Makefile.in b/xserver/hw/xprint/config/C/print/models/PS2PDFspooldir-GS/Makefile.in
index f521a2762..cd7c29b33 100644
--- a/xserver/hw/xprint/config/C/print/models/PS2PDFspooldir-GS/Makefile.in
+++ b/xserver/hw/xprint/config/C/print/models/PS2PDFspooldir-GS/Makefile.in
@@ -98,8 +98,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xprint/config/C/print/models/PSdefault/Makefile.in b/xserver/hw/xprint/config/C/print/models/PSdefault/Makefile.in
index d1a418138..b02f5cba8 100644
--- a/xserver/hw/xprint/config/C/print/models/PSdefault/Makefile.in
+++ b/xserver/hw/xprint/config/C/print/models/PSdefault/Makefile.in
@@ -104,8 +104,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xprint/config/C/print/models/PSdefault/fonts/Makefile.in b/xserver/hw/xprint/config/C/print/models/PSdefault/fonts/Makefile.in
index f0e5c01a4..c6facd1cb 100644
--- a/xserver/hw/xprint/config/C/print/models/PSdefault/fonts/Makefile.in
+++ b/xserver/hw/xprint/config/C/print/models/PSdefault/fonts/Makefile.in
@@ -95,8 +95,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xprint/config/C/print/models/PSspooldir/Makefile.in b/xserver/hw/xprint/config/C/print/models/PSspooldir/Makefile.in
index 72a04cad3..f68e2d3b2 100644
--- a/xserver/hw/xprint/config/C/print/models/PSspooldir/Makefile.in
+++ b/xserver/hw/xprint/config/C/print/models/PSspooldir/Makefile.in
@@ -98,8 +98,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xprint/config/C/print/models/SPSPARC2/Makefile.in b/xserver/hw/xprint/config/C/print/models/SPSPARC2/Makefile.in
index db9fde3af..a0f291bab 100644
--- a/xserver/hw/xprint/config/C/print/models/SPSPARC2/Makefile.in
+++ b/xserver/hw/xprint/config/C/print/models/SPSPARC2/Makefile.in
@@ -104,8 +104,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xprint/config/C/print/models/SPSPARC2/fonts/Makefile.in b/xserver/hw/xprint/config/C/print/models/SPSPARC2/fonts/Makefile.in
index af26bf717..34c66d0d1 100644
--- a/xserver/hw/xprint/config/C/print/models/SPSPARC2/fonts/Makefile.in
+++ b/xserver/hw/xprint/config/C/print/models/SPSPARC2/fonts/Makefile.in
@@ -84,8 +84,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xprint/config/Makefile.in b/xserver/hw/xprint/config/Makefile.in
index d27015735..c71d56745 100644
--- a/xserver/hw/xprint/config/Makefile.in
+++ b/xserver/hw/xprint/config/Makefile.in
@@ -106,8 +106,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xprint/config/en_US/Makefile.in b/xserver/hw/xprint/config/en_US/Makefile.in
index 155da617b..a667633d5 100644
--- a/xserver/hw/xprint/config/en_US/Makefile.in
+++ b/xserver/hw/xprint/config/en_US/Makefile.in
@@ -93,8 +93,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xprint/config/en_US/print/Makefile.in b/xserver/hw/xprint/config/en_US/print/Makefile.in
index 0c688d12a..ef3f91f44 100644
--- a/xserver/hw/xprint/config/en_US/print/Makefile.in
+++ b/xserver/hw/xprint/config/en_US/print/Makefile.in
@@ -93,8 +93,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xprint/config/en_US/print/attributes/Makefile.in b/xserver/hw/xprint/config/en_US/print/attributes/Makefile.in
index 442a19c98..f218dcbdd 100644
--- a/xserver/hw/xprint/config/en_US/print/attributes/Makefile.in
+++ b/xserver/hw/xprint/config/en_US/print/attributes/Makefile.in
@@ -95,8 +95,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xprint/doc/Makefile.in b/xserver/hw/xprint/doc/Makefile.in
index 4c10c173f..46cbab875 100644
--- a/xserver/hw/xprint/doc/Makefile.in
+++ b/xserver/hw/xprint/doc/Makefile.in
@@ -99,8 +99,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xprint/etc/Makefile.in b/xserver/hw/xprint/etc/Makefile.in
index b196f730a..bd32d9e82 100644
--- a/xserver/hw/xprint/etc/Makefile.in
+++ b/xserver/hw/xprint/etc/Makefile.in
@@ -93,8 +93,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xprint/etc/Xsession.d/Makefile.in b/xserver/hw/xprint/etc/Xsession.d/Makefile.in
index 6106b44ef..9486674d4 100644
--- a/xserver/hw/xprint/etc/Xsession.d/Makefile.in
+++ b/xserver/hw/xprint/etc/Xsession.d/Makefile.in
@@ -95,8 +95,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xprint/etc/init.d/Makefile.in b/xserver/hw/xprint/etc/init.d/Makefile.in
index 3e1809ace..e20845c69 100644
--- a/xserver/hw/xprint/etc/init.d/Makefile.in
+++ b/xserver/hw/xprint/etc/init.d/Makefile.in
@@ -89,8 +89,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xprint/etc/profile.d/Makefile.in b/xserver/hw/xprint/etc/profile.d/Makefile.in
index a9aad9a7a..90de16d5c 100644
--- a/xserver/hw/xprint/etc/profile.d/Makefile.in
+++ b/xserver/hw/xprint/etc/profile.d/Makefile.in
@@ -84,8 +84,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xprint/pcl-mono/Makefile.in b/xserver/hw/xprint/pcl-mono/Makefile.in
index aa9c81367..c23f449e0 100644
--- a/xserver/hw/xprint/pcl-mono/Makefile.in
+++ b/xserver/hw/xprint/pcl-mono/Makefile.in
@@ -106,8 +106,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xprint/pcl/Makefile.in b/xserver/hw/xprint/pcl/Makefile.in
index 27d7913bd..429ef245e 100644
--- a/xserver/hw/xprint/pcl/Makefile.in
+++ b/xserver/hw/xprint/pcl/Makefile.in
@@ -106,8 +106,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xprint/ps/Makefile.in b/xserver/hw/xprint/ps/Makefile.in
index 5275abed3..a7dcdc30f 100644
--- a/xserver/hw/xprint/ps/Makefile.in
+++ b/xserver/hw/xprint/ps/Makefile.in
@@ -117,8 +117,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xprint/raster/Makefile.in b/xserver/hw/xprint/raster/Makefile.in
index 20953e2e3..daefe877e 100644
--- a/xserver/hw/xprint/raster/Makefile.in
+++ b/xserver/hw/xprint/raster/Makefile.in
@@ -102,8 +102,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/hw/xwin/Makefile.in b/xserver/hw/xwin/Makefile.in
index 25007c663..210cde74c 100644
--- a/xserver/hw/xwin/Makefile.in
+++ b/xserver/hw/xwin/Makefile.in
@@ -185,8 +185,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/include/Makefile.in b/xserver/include/Makefile.in
index bb9a04122..1fb964f32 100644
--- a/xserver/include/Makefile.in
+++ b/xserver/include/Makefile.in
@@ -105,8 +105,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/ltmain.sh b/xserver/ltmain.sh
index ef5ee686b..25f21fea7 100644
--- a/xserver/ltmain.sh
+++ b/xserver/ltmain.sh
@@ -5822,6 +5822,10 @@ relink_command=\"$relink_command\""
esac
install_prog="$install_prog $arg"
done
+ case " $install_prog " in
+ *[\\\ /]cp\ *) extra_mode=;;
+ *) extra_mode='-m 644';;
+ esac
if test -z "$install_prog"; then
$echo "$modename: you must specify an install program" 1>&2
@@ -5976,8 +5980,8 @@ relink_command=\"$relink_command\""
test -n "$relink_command" && srcname="$realname"T
# Install the shared library and build the symlinks.
- $show "$install_prog $dir/$srcname $destdir/$realname"
- $run eval "$install_prog $dir/$srcname $destdir/$realname" || exit $?
+ $show "$install_prog $extra_mode $dir/$srcname $destdir/$realname"
+ $run eval "$install_prog $extra_mode $dir/$srcname $destdir/$realname" || exit $?
if test -n "$stripme" && test -n "$striplib"; then
$show "$striplib $destdir/$realname"
$run eval "$striplib $destdir/$realname" || exit $?
@@ -6022,8 +6026,8 @@ relink_command=\"$relink_command\""
# Install the pseudo-library for information purposes.
name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
instname="$dir/$name"i
- $show "$install_prog $instname $destdir/$name"
- $run eval "$install_prog $instname $destdir/$name" || exit $?
+ $show "$install_prog $extra_mode $instname $destdir/$name"
+ $run eval "$install_prog $extra_mode $instname $destdir/$name" || exit $?
# Maybe install the static library, too.
test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
@@ -6058,8 +6062,8 @@ relink_command=\"$relink_command\""
# Install the libtool object if requested.
if test -n "$destfile"; then
- $show "$install_prog $file $destfile"
- $run eval "$install_prog $file $destfile" || exit $?
+ $show "$install_prog $extra_mode $file $destfile"
+ $run eval "$install_prog $extra_mode $file $destfile" || exit $?
fi
# Install the old object if enabled.
@@ -6067,8 +6071,8 @@ relink_command=\"$relink_command\""
# Deduce the name of the old-style object file.
staticobj=`$echo "X$file" | $Xsed -e "$lo2o"`
- $show "$install_prog $staticobj $staticdest"
- $run eval "$install_prog \$staticobj \$staticdest" || exit $?
+ $show "$install_prog $extra_mode $staticobj $staticdest"
+ $run eval "$install_prog $extra_mode \$staticobj \$staticdest" || exit $?
fi
exit $EXIT_SUCCESS
;;
diff --git a/xserver/mfb/Makefile.in b/xserver/mfb/Makefile.in
index d661c5c24..135217b79 100644
--- a/xserver/mfb/Makefile.in
+++ b/xserver/mfb/Makefile.in
@@ -124,8 +124,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/mi/Makefile.in b/xserver/mi/Makefile.in
index 5aa92fe72..6c4709876 100644
--- a/xserver/mi/Makefile.in
+++ b/xserver/mi/Makefile.in
@@ -135,8 +135,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/miext/Makefile.in b/xserver/miext/Makefile.in
index 540794f2f..7c482ed00 100644
--- a/xserver/miext/Makefile.in
+++ b/xserver/miext/Makefile.in
@@ -93,8 +93,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/miext/cw/Makefile.in b/xserver/miext/cw/Makefile.in
index b3fa0b294..4451af408 100644
--- a/xserver/miext/cw/Makefile.in
+++ b/xserver/miext/cw/Makefile.in
@@ -102,8 +102,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/miext/damage/Makefile.in b/xserver/miext/damage/Makefile.in
index 2cbf4dacd..4f5902a31 100644
--- a/xserver/miext/damage/Makefile.in
+++ b/xserver/miext/damage/Makefile.in
@@ -114,8 +114,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/miext/rootless/Makefile.in b/xserver/miext/rootless/Makefile.in
index 4212ccfeb..bb81a173c 100644
--- a/xserver/miext/rootless/Makefile.in
+++ b/xserver/miext/rootless/Makefile.in
@@ -84,8 +84,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/miext/shadow/Makefile.in b/xserver/miext/shadow/Makefile.in
index e46eaa952..4feea291f 100644
--- a/xserver/miext/shadow/Makefile.in
+++ b/xserver/miext/shadow/Makefile.in
@@ -119,8 +119,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/os/Makefile.in b/xserver/os/Makefile.in
index 34ce63d65..23c82433c 100644
--- a/xserver/os/Makefile.in
+++ b/xserver/os/Makefile.in
@@ -125,8 +125,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/randr/Makefile.in b/xserver/randr/Makefile.in
index d740ef088..eae029ef8 100644
--- a/xserver/randr/Makefile.in
+++ b/xserver/randr/Makefile.in
@@ -114,8 +114,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/record/Makefile.in b/xserver/record/Makefile.in
index d4c796ec9..50252a8a4 100644
--- a/xserver/record/Makefile.in
+++ b/xserver/record/Makefile.in
@@ -102,8 +102,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/render/Makefile.in b/xserver/render/Makefile.in
index 57bf9802f..e310b6f8d 100644
--- a/xserver/render/Makefile.in
+++ b/xserver/render/Makefile.in
@@ -117,8 +117,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/xfixes/Makefile.in b/xserver/xfixes/Makefile.in
index 71dab3eb4..703bea375 100644
--- a/xserver/xfixes/Makefile.in
+++ b/xserver/xfixes/Makefile.in
@@ -103,8 +103,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@
diff --git a/xserver/xkb/Makefile.in b/xserver/xkb/Makefile.in
index 34dc9c6a3..090b8fc58 100644
--- a/xserver/xkb/Makefile.in
+++ b/xserver/xkb/Makefile.in
@@ -126,8 +126,12 @@ AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
BASE_FONT_PATH = @BASE_FONT_PATH@
+BSD_APM_FALSE = @BSD_APM_FALSE@
+BSD_APM_TRUE = @BSD_APM_TRUE@
BSD_KBD_MODE_FALSE = @BSD_KBD_MODE_FALSE@
BSD_KBD_MODE_TRUE = @BSD_KBD_MODE_TRUE@
+BSD_KQUEUE_APM_FALSE = @BSD_KQUEUE_APM_FALSE@
+BSD_KQUEUE_APM_TRUE = @BSD_KQUEUE_APM_TRUE@
BUILDDOCS_FALSE = @BUILDDOCS_FALSE@
BUILDDOCS_TRUE = @BUILDDOCS_TRUE@
BUILD_DATE = @BUILD_DATE@