diff options
| -rw-r--r-- | xserver/Makefile.bsd-wrapper | 3 | ||||
| -rw-r--r-- | xserver/configure.ac | 5 | ||||
| -rw-r--r-- | xserver/hw/xfree86/utils/ioport/Makefile.am | 7 |
3 files changed, 12 insertions, 3 deletions
diff --git a/xserver/Makefile.bsd-wrapper b/xserver/Makefile.bsd-wrapper index 283a7c6cb..45db806c4 100644 --- a/xserver/Makefile.bsd-wrapper +++ b/xserver/Makefile.bsd-wrapper @@ -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> @@ -42,6 +42,7 @@ 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} .else CONFIGURE_ARGS= --localstatedir=/var --sysconfdir=/etc/X11 \ diff --git a/xserver/configure.ac b/xserver/configure.ac index 3b24c206e..81a250a06 100644 --- a/xserver/configure.ac +++ b/xserver/configure.ac @@ -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(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')" AC_SUBST([BUILD_DATE]) BUILD_TIME="$(date +'1%H%M%S')" diff --git a/xserver/hw/xfree86/utils/ioport/Makefile.am b/xserver/hw/xfree86/utils/ioport/Makefile.am index e96681bbf..6652c75c1 100644 --- a/xserver/hw/xfree86/utils/ioport/Makefile.am +++ b/xserver/hw/xfree86/utils/ioport/Makefile.am @@ -25,7 +25,7 @@ # or other dealings in this Software without prior written authorization # of the copyright holder. # - +if BUILD_IOPORT bin_PROGRAMS = ioport XFREE86_SRCDIR = $(top_srcdir)/hw/xfree86 @@ -33,7 +33,7 @@ DUMMYLIB_SRCDIR = $(XFREE86_SRCDIR)/dummylib INCLUDES = $(XORG_INCS) -I$(DUMMYLIB_SRCDIR) -ioport_CFLAGS = $(XORG_CFLAGS) +ioport_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) ioport_LDADD = \ ../../os-support/libxorgos.la \ ../../dummylib/libdummy-nonserver.a \ @@ -56,3 +56,6 @@ install-exec-hook: (cd $(DESTDIR)$(bindir); $(LN_S) ioport $$i)); \ done +else +all-local: +endif |