From: Kristian Høgsberg <krh@sasori.boston.redhat.com>
Date: Fri, 16 Jan 2009 13:13:00 +0000 (-0500)
Subject: Drop libdrm CFLAGS where no longer necessary.
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8012f32978b9b3d7ca162d971be48f6d3c0aa891;p=platform%2Fupstream%2Fweston.git

Drop libdrm CFLAGS where no longer necessary.
---

diff --git a/Makefile.in b/Makefile.in
index e17425a..19ad20a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -28,8 +28,6 @@ $(libs) : LDLIBS += @FFI_LIBS@
 $(libs) :
 	gcc -shared $^ $(LDLIBS)  -o $@
 
-$(compositors) $(clients) : CFLAGS += @LIBDRM_CFLAGS@
-
 wayland-system-compositor :			\
 	wayland-system-compositor.o		\
 	evdev.o					\
diff --git a/configure.ac b/configure.ac
index 4696617..95057d5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,10 +3,9 @@ AC_PROG_CC
 
 PKG_PROG_PKG_CONFIG()
 PKG_CHECK_MODULES(FFI, [libffi])
-PKG_CHECK_MODULES(LIBDRM, [libdrm])
 
-PKG_CHECK_MODULES(EGL_COMPOSITOR, [eagle libpng cairo gdk-pixbuf-2.0 libudev])
-PKG_CHECK_MODULES(GL_COMPOSITOR, [gl x11])
+PKG_CHECK_MODULES(EGL_COMPOSITOR,
+		  [eagle libpng cairo gdk-pixbuf-2.0 libudev libdrm])
 PKG_CHECK_MODULES(CLIENT, [eagle cairo glib-2.0 libudev])
 
 if test $CC = gcc; then
diff --git a/flower.c b/flower.c
index ce2cbc8..67fc334 100644
--- a/flower.c
+++ b/flower.c
@@ -24,8 +24,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <i915_drm.h>
-#include <sys/ioctl.h>
 #include <time.h>
 #include <fcntl.h>
 #include <unistd.h>