summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTiago Vignatti <tiago.vignatti@nokia.com>2009-07-10 15:38:51 +0300
committerTiago Vignatti <tiago.vignatti@nokia.com>2009-07-10 16:36:01 +0300
commit53d64930513fecaa417bb5a922966b45c9ff8679 (patch)
tree13d8a4eb3107afb962c14b0339a83f9e433a8cf3
parentaafcae79d17c1f802bc880d2142af7171fed75d8 (diff)
configure: introduce --{enable,disable}-vgahw
Not all drivers need this kind of access. Signed-off-by: Tiago Vignatti <tiago.vignatti@nokia.com> Acked-by: Oliver McFadden <oliver.mcfadden@nokia.com>
-rw-r--r--configure.ac6
-rw-r--r--hw/xfree86/Makefile.am6
2 files changed, 10 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index 65a17de8d..c81874bc3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -583,6 +583,7 @@ AC_ARG_ENABLE(config-dbus, AS_HELP_STRING([--enable-config-dbus], [Build D-BU
AC_ARG_ENABLE(config-hal, AS_HELP_STRING([--disable-config-hal], [Build HAL support (default: auto)]), [CONFIG_HAL=$enableval], [CONFIG_HAL=auto])
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])
dnl DDXes.
AC_ARG_ENABLE(xorg, AS_HELP_STRING([--enable-xorg], [Build Xorg server (default: auto)]), [XORG=$enableval], [XORG=auto])
@@ -1023,6 +1024,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)
AC_DEFINE(SHAPE, 1, [Support SHAPE extension])
@@ -1557,7 +1559,6 @@ if test "x$XORG" = xyes; then
AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs])
AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions])
AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server])
- AC_DEFINE(WITH_VGAHW, 1, [Building vgahw module])
AC_DEFINE_DIR(__XCONFIGFILE__, XF86CONFIGFILE, [Name of configuration file])
AC_DEFINE_DIR(XF86CONFIGFILE, XF86CONFIGFILE, [Name of configuration file])
AC_DEFINE_DIR(DEFAULT_MODULE_PATH, moduledir, [Default module search path])
@@ -1565,6 +1566,9 @@ if test "x$XORG" = xyes; then
AC_DEFINE_DIR(DEFAULT_LOGPREFIX, LOGPREFIX, [Default log location])
AC_DEFINE_UNQUOTED(__VENDORDWEBSUPPORT__, ["$VENDOR_WEB"], [Vendor web address for support])
AC_DEFINE(XSERVER_LIBPCIACCESS, 1, [Use libpciaccess for all pci manipulation])
+ if test "x$VGAHW" = xyes; then
+ AC_DEFINE(WITH_VGAHW, 1, [Building vgahw module])
+ fi
driverdir="$moduledir/drivers"
AC_SUBST([moduledir])
diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
index eb487f616..df311b457 100644
--- a/hw/xfree86/Makefile.am
+++ b/hw/xfree86/Makefile.am
@@ -16,10 +16,14 @@ if XAA
XAA_SUBDIR = xaa
endif
+if VGAHW
+VGAHW_SUBDIR = vgahw
+endif
+
DOC_SUBDIR = doc
SUBDIRS = common ddc i2c x86emu int10 fbdevhw os-support parser \
- ramdac shadowfb vbe vgahw $(XAA_SUBDIR) \
+ ramdac shadowfb vbe $(VGAHW_SUBDIR) $(XAA_SUBDIR) \
xf8_16bpp loader dixmods exa modes \
$(DRI_SUBDIR) $(DRI2_SUBDIR) $(XF86UTILS_SUBDIR) $(DOC_SUBDIR)