xserver: Branch 'master'

[Adam Jackson]

 hw/xfree86/common/Makefile.am |    2 +-
 hw/xfree86/common/xf86.h      |    2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit c4081fee0995dae691665a00ea9bfdb8b8043b8c
Author: Topi Kanerva <topi.kanerva at nokia.com>
Date:   Wed Mar 4 10:23:10 2009 -0500

    Make DGA optional.

diff --git a/hw/xfree86/common/Makefile.am b/hw/xfree86/common/Makefile.am
index 2c1234c..fbd052c 100644
--- a/hw/xfree86/common/Makefile.am
+++ b/hw/xfree86/common/Makefile.am
@@ -33,7 +33,7 @@ BUILT_SOURCES = xf86DefModeSet.c
 
 AM_LDFLAGS = -r
 libcommon_la_SOURCES = xf86Configure.c xf86ShowOpts.c xf86Bus.c xf86Config.c \
-                      xf86Cursor.c xf86DGA.c xf86DPMS.c \
+                      xf86Cursor.c $(DGASOURCES) xf86DPMS.c \
                       xf86Events.c xf86Globals.c xf86AutoConfig.c \
                       xf86Option.c xf86Init.c \
                       xf86VidMode.c xf86fbman.c xf86cmap.c \
diff --git a/hw/xfree86/common/xf86.h b/hw/xfree86/common/xf86.h
index ab0e045..6614e43 100644
--- a/hw/xfree86/common/xf86.h
+++ b/hw/xfree86/common/xf86.h
@@ -183,10 +183,12 @@ extern _X_EXPORT Bool DPMSSupported(void);
 
 /* xf86DGA.c */
 
+#ifdef XFreeXDGA
 extern _X_EXPORT Bool DGAInit(ScreenPtr pScreen, DGAFunctionPtr funcs, DGAModePtr modes,
 			int num);
 extern _X_EXPORT Bool DGAReInitModes(ScreenPtr pScreen, DGAModePtr modes, int num);
 extern _X_EXPORT xf86SetDGAModeProc xf86SetDGAMode;
+#endif
 
 /* xf86Events.c */