summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTopi Kanerva <topi.kanerva@nokia.com>2009-03-04 10:23:10 -0500
committerAdam Jackson <ajax@redhat.com>2009-03-04 10:23:10 -0500
commitc4081fee0995dae691665a00ea9bfdb8b8043b8c (patch)
treebb85b02d96c6feaf4e74f5f3f45c01cfb56292d7
parentc7ebb4bef152b47880abb6ea4819416e89e6522c (diff)
Make DGA optional.
-rw-r--r--hw/xfree86/common/Makefile.am2
-rw-r--r--hw/xfree86/common/xf86.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/hw/xfree86/common/Makefile.am b/hw/xfree86/common/Makefile.am
index 2c1234c71..fbd052c6c 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 ab0e045dc..6614e431d 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 */