openbsd/xenocara
1
0
Fork 0
mirror of https://github.com/openbsd/xenocara.git synced 2025-12-13 04:39:07 +00:00
Code Issues Projects Releases Wiki Activity

implement the --disable-ioport configure option to disable the build of

Browse Source 
ioport and its symlinks and use that option. Requested by kettenis@
and others.
This commit is contained in:
matthieu
2008-05-24 20:36:04 +00:00
parent d262dc5de2
commit 1b5891c504
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
xserver/Makefile.bsd-wrapper
View File

@@ -1,4 +1,4 @@
# $OpenBSD: Makefile.bsd-wrapper,v 1.21 2008/03/25 23:41:50 matthieu Exp $ # $OpenBSD: Makefile.bsd-wrapper,v 1.22 2008/05/24 20:36:04 matthieu Exp $
.include <bsd.xconf.mk> .include <bsd.xconf.mk>
@@ -42,6 +42,7 @@ CONFIGURE_ARGS= --localstatedir=/var --sysconfdir=/etc/X11 \
--with-module-dir=${LIBDIR}/modules ${MESA_SOURCE} \ --with-module-dir=${LIBDIR}/modules ${MESA_SOURCE} \
--enable-install-setuid --enable-privsep \ --enable-install-setuid --enable-privsep \
--disable-dmx ${NO_XORG_OPTION} ${NO_XF86_UTIL_OPTION} \ --disable-dmx ${NO_XORG_OPTION} ${NO_XF86_UTIL_OPTION} \
--disable-ioport \
${NO_XPRINT_OPTION} ${DRI_OPTION} ${NO_XPRINT_OPTION} ${DRI_OPTION}
.else .else
CONFIGURE_ARGS= --localstatedir=/var --sysconfdir=/etc/X11 \ CONFIGURE_ARGS= --localstatedir=/var --sysconfdir=/etc/X11 \

5
xserver/configure.ac
View File

@@ -2016,6 +2016,11 @@ AM_CONDITIONAL(BUILD_KBD_MODE, [test x$BUILD_KBD_MODE = xyes])
AM_CONDITIONAL(BSD_KBD_MODE, [test x$KBD_MODE_TYPE = xbsd]) AM_CONDITIONAL(BSD_KBD_MODE, [test x$KBD_MODE_TYPE = xbsd])
AM_CONDITIONAL(SUN_KBD_MODE, [test x$KBD_MODE_TYPE = xsun]) AM_CONDITIONAL(SUN_KBD_MODE, [test x$KBD_MODE_TYPE = xsun])
AC_ARG_ENABLE(ioport, AS_HELP_STRING([--enable-ioport],
[Build ioport utilities (default: yes)]),
[BUILD_IOPORT=$enable_val], [BUILD_IOPORT="yes"])
AM_CONDITIONAL(BUILD_IOPORT, [test x$BUILD_IOPORT = xyes])
BUILD_DATE="$(date +'%Y%m%d')" BUILD_DATE="$(date +'%Y%m%d')"
AC_SUBST([BUILD_DATE]) AC_SUBST([BUILD_DATE])
BUILD_TIME="$(date +'1%H%M%S')" BUILD_TIME="$(date +'1%H%M%S')"

5
xserver/hw/xfree86/utils/ioport/Makefile.am
View File

@@ -25,7 +25,7 @@
# or other dealings in this Software without prior written authorization # or other dealings in this Software without prior written authorization
# of the copyright holder. # of the copyright holder.
# #
if BUILD_IOPORT
bin_PROGRAMS = ioport bin_PROGRAMS = ioport
XFREE86_SRCDIR = $(top_srcdir)/hw/xfree86 XFREE86_SRCDIR = $(top_srcdir)/hw/xfree86
@@ -56,3 +56,6 @@ install-exec-hook:
(cd $(DESTDIR)$(bindir); $(LN_S) ioport $$i)); \ (cd $(DESTDIR)$(bindir); $(LN_S) ioport $$i)); \
done done
else
all-local:
endif