Currently it is not possible to compile Xorg without having DGA proto installed and DGA enabled. Let's put the previously defined DGASOURCES variable to good use. If building/running with xf86-video-fbdev, it needs to be patched as well to get rid of DGA refs.
Signed-off-by: Topi Kanerva <[email protected]> --- hw/xfree86/common/Makefile.am | 2 +- hw/xfree86/common/xf86.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletions(-) 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 */ -- 1.6.1.3 _______________________________________________ xorg-devel mailing list [email protected] http://lists.x.org/mailman/listinfo/xorg-devel
