xserver: Branch 'master' - 3 commits

[Oliver McFadden]

 configure.ac                   |    2 ++
 hw/xfree86/Makefile.am         |    8 ++++++--
 hw/xfree86/common/xf86Config.c |    6 ++++++
 include/xorg-server.h.in       |    3 +++
 4 files changed, 17 insertions(+), 2 deletions(-)

New commits:
commit 21cbb4c9de44e2629dc0fa6f647ce2d139f2cef0
Author: Oliver McFadden <oliver.mcfadden at nokia.com>
Date:   Wed Jun 24 00:24:44 2009 +0300

    xorg-server.h.in: Export the X Access Control Extension (XACE), too.
    
    Acked-by: Daniel Stone <daniel at fooishbar.org>

diff --git a/include/xorg-server.h.in b/include/xorg-server.h.in
index 3189ff3..957a030 100644
--- a/include/xorg-server.h.in
+++ b/include/xorg-server.h.in
@@ -187,4 +187,7 @@
 /* Use libpciaccess */
 #undef XSERVER_LIBPCIACCESS
 
+/* X Access Control Extension */
+#undef XACE
+
 #endif /* _XORG_SERVER_H_ */
commit 800d4ceb946c93724661ebfd28afb658ca63b6b1
Author: Tiago Vignatti <tiago.vignatti at nokia.com>
Date:   Wed Jun 24 00:13:32 2009 +0300

    configure: Provide the --enable/disable-xaa option.
    
    Acked-by: Daniel Stone <daniel at fooishbar.org>

diff --git a/configure.ac b/configure.ac
index f9a967c..0fca440 100644
--- a/configure.ac
+++ b/configure.ac
@@ -582,6 +582,7 @@ AC_ARG_ENABLE(dpms,           AS_HELP_STRING([--disable-dpms], [Build DPMS exten
 AC_ARG_ENABLE(config-dbus,    AS_HELP_STRING([--enable-config-dbus], [Build D-BUS API support (default: no)]), [CONFIG_DBUS_API=$enableval], [CONFIG_DBUS_API=no])
 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])
 
 dnl DDXes.
 AC_ARG_ENABLE(xorg,    	      AS_HELP_STRING([--enable-xorg], [Build Xorg server (default: auto)]), [XORG=$enableval], [XORG=auto])
@@ -1021,6 +1022,7 @@ XI_LIB='$(top_builddir)/Xi/libXi.la'
 XI_INC='-I$(top_srcdir)/Xi'
 
 AM_CONDITIONAL(XF86UTILS, test "x$XF86UTILS" = xyes)
+AM_CONDITIONAL(XAA, test "x$XAA" = xyes)
 
 AC_DEFINE(SHAPE, 1, [Support SHAPE extension])
 
diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
index 3b9ff9c..9d5731d 100644
--- a/hw/xfree86/Makefile.am
+++ b/hw/xfree86/Makefile.am
@@ -12,15 +12,19 @@ if XF86UTILS
 XF86UTILS_SUBDIR = utils
 endif
 
+if XAA
+XAA_SUBDIR = xaa
+endif
+
 DOC_SUBDIR = doc
 
 SUBDIRS = common ddc i2c x86emu int10 fbdevhw os-support parser \
-	  ramdac shadowfb vbe vgahw xaa \
+	  ramdac shadowfb vbe vgahw $(XAA_SUBDIR) \
 	  xf8_16bpp loader dixmods exa modes \
 	  $(DRI_SUBDIR) $(DRI2_SUBDIR) $(XF86UTILS_SUBDIR) $(DOC_SUBDIR)
 
 DIST_SUBDIRS = common ddc i2c x86emu int10 fbdevhw os-support \
-               parser ramdac shadowfb vbe vgahw xaa \
+               parser ramdac shadowfb vbe vgahw $(XAA_SUBDIR) \
                xf8_16bpp loader dixmods dri dri2 exa modes \
 	       utils doc
 
commit ce3d539ac6ecab3e343cef7c4dc112bc82ea3b02
Author: Oliver McFadden <oliver.mcfadden at nokia.com>
Date:   Wed Jun 24 00:08:51 2009 +0300

    xf86Config: Avoid attempting to load non-compiled modules.
    
    Acked-by: Daniel Stone <daniel at fooishbar.org>

diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
index 24049aa..60e66ab 100644
--- a/hw/xfree86/common/xf86Config.c
+++ b/hw/xfree86/common/xf86Config.c
@@ -108,12 +108,18 @@ extern DeviceAssocRec mouse_assoc;
 
 static ModuleDefault ModuleDefaults[] = {
     {.name = "extmod",   .toLoad = TRUE,    .load_opt=NULL},
+#ifdef DBE
     {.name = "dbe",      .toLoad = TRUE,    .load_opt=NULL},
+#endif
+#ifdef GLXEXT
     {.name = "glx",      .toLoad = TRUE,    .load_opt=NULL},
+#endif
 #ifdef XRECORD
     {.name = "record",   .toLoad = TRUE,    .load_opt=NULL},
 #endif
+#ifdef XF86DRI
     {.name = "dri",      .toLoad = TRUE,    .load_opt=NULL},
+#endif
 #ifdef DRI2
     {.name = "dri2",     .toLoad = TRUE,    .load_opt=NULL},
 #endif