always require libdrm

... and also add the missing files to lib/Makefile.am

Signed-Off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

benchmarks/Makefile.am

@@ -2,14 +2,12 @@ NULL=#
 
 bin_PROGRAMS = $(NULL)
 
-if HAVE_DRM
 bin_PROGRAMS += \
 		intel_upload_blit_large \
 		intel_upload_blit_large_gtt \
 		intel_upload_blit_large_map \
 		intel_upload_blit_small \
 		$(NULL)
-endif
 
 BENCHMARK_LIBS = \
 	../lib/libintel_tools.la \

configure.ac

@@ -48,12 +48,7 @@ AM_PROG_CC_C_O
 LT_PREREQ([2.2])
 LT_INIT([disable-static])
 
-PKG_CHECK_MODULES(DRM, [libdrm_intel >= 2.4.23], have_drm=yes, have_drm=no)
-if test "x$have_drm" = "xyes"; then
-	AC_DEFINE([HAVE_DRM], 1, [Define to 1 if we have DRM support])
-fi
-AM_CONDITIONAL(HAVE_DRM, test "x$have_drm" = "xyes")
-
+PKG_CHECK_MODULES(DRM, [libdrm_intel >= 2.4.23])
 PKG_CHECK_MODULES(PCIACCESS, [pciaccess >= 0.10])
 
 PKG_CHECK_MODULES(CAIRO, cairo, [HAVE_CAIRO=yes], [HAVE_CAIRO=no])

lib/Makefile.am

@@ -3,6 +3,7 @@ NULL=#
 AM_CFLAGS = $(WARN_CFLAGS) -I$(srcdir)/..
 libintel_tools_la_SOURCES = \
 	intel_batchbuffer.h \
+	intel_batchbuffer.c \
 	intel_chipset.h \
 	intel_gpu_tools.h \
 	intel_mmio.c \
@@ -12,18 +13,14 @@ libintel_tools_la_SOURCES = \
 	i915_reg.h \
 	i830_reg.h \
 	intel_reg_map.c \
+	intel_drm.c \
 	instdone.c \
 	instdone.h \
-	drmtest.h
-
-if HAVE_DRM
-libintel_tools_la_SOURCES += \
-	intel_batchbuffer.c \
-	intel_drm.c \
-	drmtest.c \
+	drmtest.h \
+	debug.h \
 	$(NULL)
+
 AM_CFLAGS += $(DRM_CFLAGS)
-endif
 
 
 noinst_LTLIBRARIES = libintel_tools.la

tests/Makefile.am

@@ -1,4 +1,3 @@
-if HAVE_DRM
 noinst_PROGRAMS = \
 	gem_stress \
 	$(TESTS_progs) \
@@ -100,4 +99,3 @@ endif
 
 gem_fence_thrash_CFLAGS = $(AM_CFLAGS) -pthread
 gem_fence_thrash_LDADD = $(LDADD) -lpthread
-endif