Edit

IABSD.fr/xenocara/xserver/Makefile.bsd-wrapper

Branch :

  • Show log

    Commit

  • Author : matthieu
    Date : 2011-03-08 07:59:23
    Hash : 2cc47a12
    Message : add a new build switch 'XENOCARA_USE_XKEYBOARD_CONFIG' to enable the use of xkeyboard-config xkb definitions instead of the old xkbdata. This will make testing easier. No changes in default builds. ok shadchin@

  • xserver/Makefile.bsd-wrapper
  • # $OpenBSD: Makefile.bsd-wrapper,v 1.35 2011/03/08 07:59:23 matthieu Exp $
    
    .include <bsd.xconf.mk>
    
    DIST= ${.CURDIR}
    
    # Machines for which we don't build the Xorg Xserver
    NO_XORG_MACHINES=	alpha aviion hppa64 landisk \
    			mvme68k mvme88k mvmeppc solbourne vax
    
    NO_XF86UTIL_MACHINES=	hp300 landisk mac68k sgi sparc vax
    
    .for M in ${NO_XORG_MACHINES} 
    NO_XORG_${M} = --disable-xorg
    .endfor
    NO_XORG_OPTION=${NO_XORG_${MACHINE}}
    
    .for M in ${NO_XF86UTIL_MACHINES}
    NO_XF86_UTIL_${M} = --disable-xfree86-utils
    .endfor
    NO_XF86_UTIL_OPTION=${NO_XF86_UTIL_${MACHINE}}
    
    .if ${XENOCARA_BUILD_GL:L} != "yes"
    GLX_OPTION=	--disable-glx
    .endif
    
    .if ${XENOCARA_BUILD_DRI:L} == "yes"
    DRI_OPTION=	--enable-dri --enable-dri2 \
    		--with-dri-driver-path=${X11BASE}/lib/modules/dri
    .else
    DRI_OPTION=	--disable-dri --disable-dri2
    .endif
    
    .if ${XENOCARA_USE_XKEYBOARD_CONFIG:L} == "yes"
    XKB_PATH=	${X11BASE}/share/X11/xkb
    XKB_RULES=	base
    .else
    XKB_PATH=	/etc/X11/xkb
    XKB_RULES=	xorg
    .endif
    
    CONFIGURE_ARGS=	--localstatedir=/var --sysconfdir=/etc/X11 \
    		--with-xkb-path=${XKB_PATH} \
    		--with-xkb-output=/var/db/xkb \
    		--with-default-xkb-rules=${XKB_RULES} \
    		--with-module-dir=${LIBDIR}/modules ${GLX_OPTION} \
    		--enable-install-setuid --enable-privsep \
    		--disable-dmx ${NO_XORG_OPTION} ${NO_XF86_UTIL_OPTION} \
    		--disable-unit-tests --disable-xace \
    		${DRI_OPTION}
    
    .include <bsd.xorg.mk>