diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2008-10-12 10:46:41 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2008-10-12 10:46:41 +0000 |
| commit | db7eaab7d988f5e37087cc91fddf9c192ff52477 (patch) | |
| tree | 582a2d08a951e165fb82503c2748bc9cc6b91e82 | |
| parent | 0c6bd9530138020d9d5507ff10f75b7b3032eaf3 (diff) | |
Xprt is not built by default anymore. Remove the code that selectively
disabled it on a few platforms.
| -rw-r--r-- | xserver/Makefile.bsd-wrapper | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/xserver/Makefile.bsd-wrapper b/xserver/Makefile.bsd-wrapper index 894774978..ab4dd6f80 100644 --- a/xserver/Makefile.bsd-wrapper +++ b/xserver/Makefile.bsd-wrapper @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.23 2008/10/08 02:24:29 todd Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.24 2008/10/12 10:46:40 matthieu Exp $ .include <bsd.xconf.mk> @@ -10,18 +10,11 @@ NO_XORG_MACHINES= aviion hppa hppa64 landisk \ NO_XF86UTIL_MACHINES= hp300 landisk mac68k sgi sparc vax -NO_XPRINT_MACHINES= landisk vax - .for M in ${NO_XORG_MACHINES} NO_XORG_${M} = --disable-xorg .endfor NO_XORG_OPTION=${NO_XORG_${MACHINE}} -.for M in ${NO_XPRINT_MACHINES} -NO_XPRINT_${M}= --disable-xprint -.endfor -NO_XPRINT_OPTION=${NO_XPRINT_${MACHINE}} - .for M in ${NO_XF86UTIL_MACHINES} NO_XF86_UTIL_${M} = --disable-xfree86-utils .endfor @@ -42,15 +35,13 @@ CONFIGURE_ARGS= --localstatedir=/var --sysconfdir=/etc/X11 \ --with-module-dir=${LIBDIR}/modules ${MESA_SOURCE} \ --enable-install-setuid --enable-privsep \ --disable-dmx ${NO_XORG_OPTION} ${NO_XF86_UTIL_OPTION} \ - --disable-ioport \ - ${NO_XPRINT_OPTION} ${DRI_OPTION} + --disable-ioport ${DRI_OPTION} .else CONFIGURE_ARGS= --localstatedir=/var --sysconfdir=/etc/X11 \ --disable-xorg \ --disable-xinput \ --enable-kdrive \ --disable-dmx \ - --disable-xprint \ --disable-xnest \ --disable-xvfb .endif |