diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2006-11-28 20:29:33 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2006-11-28 20:29:33 +0000 |
| commit | 70ce0341935fd116216e76d40ef65d969227e892 (patch) | |
| tree | 6c3f151e6258cb75b0b1983e1e563d2b95ec457d /xserver/configure.ac | |
| parent | df6b77dc03dec3df43fadeb2f3a4912966e93ea1 (diff) | |
OpenBSD local modifications:
- privilege separation
- some snprintf/strlc{at,py} conversions
- support for more architectures
- signal handler fixes
- default mouse wheel support in config tools
- sunmouse protocol
Diffstat (limited to 'xserver/configure.ac')
| -rw-r--r-- | xserver/configure.ac | 25 |
1 files changed, 22 insertions, 3 deletions
diff --git a/xserver/configure.ac b/xserver/configure.ac index 128130df5..134c4b50e 100644 --- a/xserver/configure.ac +++ b/xserver/configure.ac @@ -1,4 +1,4 @@ -dnl $Id: configure.ac,v 1.1 2006/11/26 18:13:43 matthieu Exp $ +dnl $Id: configure.ac,v 1.2 2006/11/28 20:29:31 matthieu Exp $ dnl dnl Copyright © 2003-2005 Keith Packard, Daniel Stone dnl @@ -241,6 +241,8 @@ esac dnl BSD *_video.c selection AM_CONDITIONAL(ALPHA_VIDEO, [test "x$ALPHA_VIDEO" = xyes]) AM_CONDITIONAL(ARM_VIDEO, [test "x$ARM_VIDEO" = xyes]) +AM_CONDITIONAL(HP300_VIDEO, [text "x$HP300_VIDEO" = xyes]) +AM_CONDITIONAL(HPPA_VIDEO, [text "x$HPPA_VIDEO" = xyes]) AM_CONDITIONAL(I386_VIDEO, [test "x$I386_VIDEO" = xyes]) AM_CONDITIONAL(PPC_VIDEO, [test "x$PPC_VIDEO" = xyes]) AM_CONDITIONAL(SPARC64_VIDEO, [test "x$SPARC64_VIDEO" = xyes]) @@ -395,6 +397,16 @@ AC_ARG_ENABLE(install-libxf86config, [INSTALL_LIBXF86CONFIG=$enableval], [INSTALL_LIBXF86CONFIG=no]) +dnl Privsep +AC_ARG_ENABLE(privsep, + AC_HELP_STRING([--enable-privsep], + [Build support for X server privilege separation (default is NO)]), + [ENABLE_PRIVSEP="$enableval"], [ENABLE_PRIVSEP="no"]) +if test x$ENABLE_PRIVSEP = xyes ; then + AC_DEFINE(X_PRIVSEP, 1, [Use X server privilege separation]) +fi +AM_CONDITIONAL(X_PRIVSEP, [test x$ENABLE_PRIVSEP = xyes]) + dnl Extensions. AC_ARG_ENABLE(composite, AS_HELP_STRING([--disable-composite], [Build Composite extension (default: enabled)]), [COMPOSITE=$enableval], [COMPOSITE=yes]) AC_ARG_ENABLE(mitshm, AS_HELP_STRING([--disable-shm], [Build SHM extension (default: enabled)]), [MITSHM=$enableval], [MITSHM=yes]) @@ -1173,7 +1185,7 @@ int main () { XORG_OS_SUBDIR="bsd" XORG_OS_KBD="BSD" case $host_cpu in - i*86|amd64*|x86_64*|ia64*) + i*86|amd64*|x86_64*) ;; *) xorg_bus_freebsdpci="yes" @@ -1257,7 +1269,14 @@ int main () { ;; sparc*) xorg_bus_sparcpci="yes" - xorg_bus_sparc="yes" + case $host_os in + openbsd*) + xorg_bus_sparc="no" + ;; + *) + xorg_bus_sparc="yes" + ;; + esac ;; x86_64*|amd64*) case $host_os in |