diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2016-07-30 12:18:36 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2016-07-30 12:18:36 +0000 |
| commit | a48c2584af05d81df5f8f8a069f778894d80ab2c (patch) | |
| tree | dc20b778535e10de9f3f1fd28902a24c342fcb61 /xserver | |
| parent | a17e28e18db4858a49d5582d6d986a1e651fdb5a (diff) | |
Merge the build of Xephyr in the main xserver build.
Recent X server doesn't require to build the DIX with different
options for xfree86 and kdrive.
Tested for beeing a no-op on m88k by Kenji Aoyama. Thanks
Diffstat (limited to 'xserver')
| -rw-r--r-- | xserver/Makefile.bsd-wrapper | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/xserver/Makefile.bsd-wrapper b/xserver/Makefile.bsd-wrapper index 90b28ecbb..8aef2321e 100644 --- a/xserver/Makefile.bsd-wrapper +++ b/xserver/Makefile.bsd-wrapper @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.62 2016/05/12 07:19:50 matthieu Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.63 2016/07/30 12:18:35 matthieu Exp $ .include <bsd.xconf.mk> @@ -16,6 +16,7 @@ NO_XORG_OPTION=${NO_XORG_${MACHINE}} GLX_OPTION= --disable-glx .else GLX_OPTION= --enable-glamor +KDRIVE_OPTION= --enable-kdrive .endif .if ${XENOCARA_BUILD_DRI:L} == "yes" @@ -33,6 +34,7 @@ CONFIGURE_ARGS= --localstatedir=/var --sysconfdir=/etc/X11 \ --with-default-xkb-rules=${XKB_RULES} \ --with-module-dir=${LIBDIR}/modules ${GLX_OPTION} \ --enable-install-setuid --enable-privsep \ + ${KDRIVE_OPTION} \ --enable-xcsecurity \ --without-fop --without-xmlto --without-xsltproc \ --disable-dmx ${NO_XORG_OPTION} \ |