Post-merge fixups:

- 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.

src/i810.h

@@ -55,7 +55,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "xf86drm.h"
 #include "sarea.h"
 #define _XF86DRI_SERVER_
-#include "xf86dri.h"
 #include "dri.h"
 #include "GL/glxint.h"
 #include "i810_dri.h"

src/i810_dri.h

@@ -3,7 +3,6 @@
 #ifndef _I810_DRI_
 #define _I810_DRI_
 
-#include "xf86dri.h"
 #include "xf86drm.h"
 #include "i810_common.h"
 

src/i830.h

@@ -63,7 +63,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "xf86drm.h"
 #include "sarea.h"
 #define _XF86DRI_SERVER_
-#include "xf86dri.h"
 #include "dri.h"
 #include "GL/glxint.h"
 #include "i830_dri.h"

src/i830_dri.h

@@ -3,7 +3,6 @@
 #ifndef _I830_DRI_H
 #define _I830_DRI_H
 
-#include "xf86dri.h"
 #include "xf86drm.h"
 #include "i830_common.h"