Post-merge fixups:XORG-6_99_99_900XORG-6_8_99_900

- Disable building the gamma driver
- Fix numerous Imakefiles to get header paths and subdirs right
- Symlink client-side GLX lib source from Mesa
- Add new shader subdirs to the Mesa core build
- Tweak the DDX drivers to not ask for "xf86dri.h"; they don't need it,
    since they don't generate protocol, and it was breaking the build.

2 files changed, 1 insertions, 1 deletions

diff --git a/src/mga.h b/src/mga.h
index 32ea21b..97eeec0 100644
--- a/src/mga.h
+++ b/src/mga.h
@@ -36,7 +36,6 @@
 
 
 
-#include "xf86dri.h"
 #include "dri.h"
 
 
diff --git a/src/mga_dri.h b/src/mga_dri.h
index 228bce9..218b8fb 100644
--- a/src/mga_dri.h
+++ b/src/mga_dri.h
@@ -31,6 +31,7 @@
 #ifndef __MGA_DRI_H__
 #define __MGA_DRI_H__
 
+#include <X11/Xfuncproto.h>
 #include "xf86drm.h"
 
 #define MGA_DEFAULT_AGP_MODE     1