diff options
| author | Tiago Vignatti <tiago.vignatti@nokia.com> | 2009-07-10 15:54:07 +0300 |
|---|---|---|
| committer | Tiago Vignatti <tiago.vignatti@nokia.com> | 2009-07-10 16:36:32 +0300 |
| commit | 42d95a38535f382bfb2ddfaef93839ab9bbf584f (patch) | |
| tree | 732384d8bc49b4389ee8942767b3b0ff75d49848 | |
| parent | 53d64930513fecaa417bb5a922966b45c9ff8679 (diff) | |
configure: introduce --{enable,disable}-vbe
Not all drivers need this kind of access as well.
Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Acked-by: Oliver McFadden <oliver.mcfadden@nokia.com>
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | hw/xfree86/Makefile.am | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index c81874bc3..07bb05a70 100644 --- a/configure.ac +++ b/configure.ac @@ -584,6 +584,7 @@ AC_ARG_ENABLE(config-hal, AS_HELP_STRING([--disable-config-hal], [Build HAL AC_ARG_ENABLE(xfree86-utils, AS_HELP_STRING([--enable-xfree86-utils], [Build xfree86 DDX utilities (default: enabled)]), [XF86UTILS=$enableval], [XF86UTILS=yes]) 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]) dnl DDXes. AC_ARG_ENABLE(xorg, AS_HELP_STRING([--enable-xorg], [Build Xorg server (default: auto)]), [XORG=$enableval], [XORG=auto]) @@ -1025,6 +1026,7 @@ XI_INC='-I$(top_srcdir)/Xi' 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) AC_DEFINE(SHAPE, 1, [Support SHAPE extension]) diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am index df311b457..6154d7f57 100644 --- a/hw/xfree86/Makefile.am +++ b/hw/xfree86/Makefile.am @@ -20,10 +20,14 @@ if VGAHW VGAHW_SUBDIR = vgahw endif +if VBE +VBE_SUBDIR = vbe +endif + DOC_SUBDIR = doc SUBDIRS = common ddc i2c x86emu int10 fbdevhw os-support parser \ - ramdac shadowfb vbe $(VGAHW_SUBDIR) $(XAA_SUBDIR) \ + ramdac shadowfb $(VBE_SUBDIR) $(VGAHW_SUBDIR) $(XAA_SUBDIR) \ xf8_16bpp loader dixmods exa modes \ $(DRI_SUBDIR) $(DRI2_SUBDIR) $(XF86UTILS_SUBDIR) $(DOC_SUBDIR) |