Nouveau - Jun 2014 - [PATCH 2/2] present: build only when glamor is enabled

nouveau_present_flip_exec references glamor_fd_from_pixmap,
which do not exist when glamor is disabled

Signed-off-by: Marcin Slusarz <marcin.slusarz at gmail.com>
---
 src/nouveau_present.c | 2 +-
 src/nouveau_present.h | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/nouveau_present.c b/src/nouveau_present.c
index b294bbe..38f2cac 100644
--- a/src/nouveau_present.c
+++ b/src/nouveau_present.c
@@ -23,7 +23,7 @@
  */
 
 #include "nouveau_present.h"
-#ifdef DRI3
+#if defined(DRI3) && defined(HAVE_GLAMOR)
 #include "nv_include.h"
 #include "nouveau_glamor.h"
 #include "xf86drmMode.h"
diff --git a/src/nouveau_present.h b/src/nouveau_present.h
index dea19ce..958c2f7 100644
--- a/src/nouveau_present.h
+++ b/src/nouveau_present.h
@@ -4,7 +4,11 @@
 #include "xorg-server.h"
 #include "scrnintstr.h"
 
-#ifdef DRI3
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#if defined(DRI3) && defined(HAVE_GLAMOR)
 #include "present.h"
 Bool nouveau_present_init(ScreenPtr pScreen);
 void nouveau_present_fini(ScreenPtr pScreen);
-- 
2.0.0