diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2007-05-12 14:25:00 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2007-05-12 14:25:00 +0000 |
| commit | 67cfbd2544808ca49f880c694d332ae86749850a (patch) | |
| tree | c4f301528eb7fadb40a3c9131aec9eb642c1cfd7 /xserver | |
| parent | bc421b2cf4930d4ef73ad58c9d56b37fcfb31f4e (diff) | |
- Disable OpenGL parts on vax and sgi
- Disable Xprt on vax and landisk
Xenocara now builds on vax
Diffstat (limited to 'xserver')
| -rw-r--r-- | xserver/Makefile.bsd-wrapper | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/xserver/Makefile.bsd-wrapper b/xserver/Makefile.bsd-wrapper index fdcb71277..6cba14203 100644 --- a/xserver/Makefile.bsd-wrapper +++ b/xserver/Makefile.bsd-wrapper @@ -1,29 +1,39 @@ -# $OpenBSD: Makefile.bsd-wrapper,v 1.12 2007/04/15 17:42:08 matthieu Exp $ +# $OpenBSD: Makefile.bsd-wrapper,v 1.13 2007/05/12 14:24:59 matthieu Exp $ DIST= ${.CURDIR} # Machines for which we don't build the Xorg Xserver NO_XORG_MACHINES= aviion hppa hppa64 landisk \ - mvme68k mvme88k mvmeppc sgi solbourne + mvme68k mvme88k mvmeppc sgi solbourne vax -NO_XF86UTIL_MACHINES= hp300 mac68k sparc vax +NO_XF86UTIL_MACHINES= hp300 landisk mac68k 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_OPTION= --disable-xprint +.endfor + .for M in ${NO_XF86UTIL_MACHINES} NO_XF86_UTIL_${M} = --disable-xfree86-utils .endfor NO_XF86_UTIL_OPTION=${NO_XF86_UTIL_${MACHINE}} +.if ${MACHINE} != "sgi" && ${MACHINE} != "vax" +MESA_SOURCE= --with-mesa-source=${XSRCDIR}/dist/Mesa +.endif + CONFIGURE_ARGS= --localstatedir=/var --sysconfdir=/etc/X11 \ --with-xkb-path=/etc/X11/xkb \ --with-xkb-output=/var/db/xkb \ - --with-module-dir=${LIBDIR}/modules \ - --with-mesa-source=${XSRCDIR}/dist/Mesa \ + --with-module-dir=${LIBDIR}/modules ${MESA_SOURCE} \ --enable-install-setuid --enable-privsep \ - --disable-dmx ${NO_XORG_OPTION} ${NO_XF86_UTIL_OPTION} + --disable-dmx ${NO_XORG_OPTION} ${NO_XF86_UTIL_OPTION} \ + ${NO_XPRINT_OPTION} .include <bsd.xorg.mk> |