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.

1 files changed, 0 insertions, 1 deletions

diff --git a/src/sis.h b/src/sis.h
index 181361c..50c4491 100644
--- a/src/sis.h
+++ b/src/sis.h
@@ -166,7 +166,6 @@
 #include "xf86drm.h"
 #include "sarea.h"
 #define _XF86DRI_SERVER_
-#include "xf86dri.h"
 #include "dri.h"
 #include "GL/glxint.h"
 #include "sis_dri.h"