summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTiago Vignatti <tiago.vignatti@nokia.com>2009-07-10 16:09:08 +0300
committerTiago Vignatti <tiago.vignatti@nokia.com>2009-07-10 16:36:51 +0300
commit2638e9899e57d9b25a2cade3247083a6e101dee2 (patch)
tree19b3f6b9a4811c5d1bc84e8b188a58d772f28e09
parent42d95a38535f382bfb2ddfaef93839ab9bbf584f (diff)
configure: introduce --{enable,disable}-int10-module
Not all chipsets need to rely on the int10 scheme to do its daily work. Well, the ideal would be to remove all int10 module from the server. I'll try to provide some patches "soon" for this. Something like: http://cgit.freedesktop.org/~vignatti/libx86/ Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com> Acked-by: Oliver McFadden <oliver.mcfadden@nokia.com>
-rw-r--r--configure.ac2
-rw-r--r--hw/xfree86/Makefile.am6
2 files changed, 7 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 07bb05a70..a2e008041 100644
--- a/configure.ac
+++ b/configure.ac
@@ -585,6 +585,7 @@ AC_ARG_ENABLE(xfree86-utils, AS_HELP_STRING([--enable-xfree86-utils], [Build
AC_ARG_ENABLE(xaa, AS_HELP_STRING([--enable-xaa], [Build XAA (default: enabled)]), [XAA=$enableval], [XAA=yes])
AC_ARG_ENABLE(vgahw, AS_HELP_STRING([--enable-vgahw], [Build Xorg with vga access (default: enabled)]), [VGAHW=$enableval], [VGAHW=yes])
AC_ARG_ENABLE(vbe, AS_HELP_STRING([--enable-vbe], [Build Xorg with VBE module (default: enabled)]), [VBE=$enableval], [VBE=yes])
+AC_ARG_ENABLE(int10-module, AS_HELP_STRING([--enable-int10-module], [Build Xorg with int10 module (default: enabled)]), [INT10MODULE=$enableval], [INT10MODULE=yes])
dnl DDXes.
AC_ARG_ENABLE(xorg, AS_HELP_STRING([--enable-xorg], [Build Xorg server (default: auto)]), [XORG=$enableval], [XORG=auto])
@@ -1027,6 +1028,7 @@ AM_CONDITIONAL(XF86UTILS, test "x$XF86UTILS" = xyes)
AM_CONDITIONAL(XAA, test "x$XAA" = xyes)
AM_CONDITIONAL(VGAHW, test "x$VGAHW" = xyes)
AM_CONDITIONAL(VBE, test "x$VBE" = xyes)
+AM_CONDITIONAL(INT10MODULE, test "x$INT10MODULE" = xyes)
AC_DEFINE(SHAPE, 1, [Support SHAPE extension])
diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
index 6154d7f57..957cb178c 100644
--- a/hw/xfree86/Makefile.am
+++ b/hw/xfree86/Makefile.am
@@ -24,9 +24,13 @@ if VBE
VBE_SUBDIR = vbe
endif
+if INT10MODULE
+INT10_SUBDIR = int10
+endif
+
DOC_SUBDIR = doc
-SUBDIRS = common ddc i2c x86emu int10 fbdevhw os-support parser \
+SUBDIRS = common ddc i2c x86emu $(INT10MODULE) fbdevhw os-support parser \
ramdac shadowfb $(VBE_SUBDIR) $(VGAHW_SUBDIR) $(XAA_SUBDIR) \
xf8_16bpp loader dixmods exa modes \
$(DRI_SUBDIR) $(DRI2_SUBDIR) $(XF86UTILS_SUBDIR) $(DOC_SUBDIR)