From 1b5a94916fbec77eea427727a8a71ca6d8083e71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tapani=20P=C3=A4lli?= Date: Wed, 27 Nov 2013 10:55:08 +0200 Subject: [PATCH] egl: add HAVE_LIBDRM for X11 platform MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=72062 Cc: mesa-stable@lists.freedesktop.org Signed-off-by: Tapani Pälli --- configure.ac | 1 + src/egl/drivers/dri2/Makefile.am | 1 + src/egl/drivers/dri2/platform_x11.c | 4 ++-- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 8c52535..ce19d76 100644 --- a/configure.ac +++ b/configure.ac @@ -761,6 +761,7 @@ AC_SUBST([MESA_LLVM]) # Check for libdrm PKG_CHECK_MODULES([LIBDRM], [libdrm >= $LIBDRM_REQUIRED], [have_libdrm=yes], [have_libdrm=no]) +AM_CONDITIONAL(HAVE_LIBDRM, test "x$have_lidrm" = xyes) PKG_CHECK_MODULES([LIBUDEV], [libudev >= $LIBUDEV_REQUIRED], have_libudev=yes, have_libudev=no) diff --git a/src/egl/drivers/dri2/Makefile.am b/src/egl/drivers/dri2/Makefile.am index 823ef5e..a6a81df 100644 --- a/src/egl/drivers/dri2/Makefile.am +++ b/src/egl/drivers/dri2/Makefile.am @@ -29,6 +29,7 @@ AM_CFLAGS = \ -I$(top_builddir)/src/egl/wayland/wayland-drm \ $(DEFINES) \ $(VISIBILITY_CFLAGS) \ + $(HAVE_LIBDRM) \ $(LIBDRM_CFLAGS) \ $(LIBUDEV_CFLAGS) \ $(LIBKMS_CFLAGS) \ diff --git a/src/egl/drivers/dri2/platform_x11.c b/src/egl/drivers/dri2/platform_x11.c index c56a413..fbfc675 100644 --- a/src/egl/drivers/dri2/platform_x11.c +++ b/src/egl/drivers/dri2/platform_x11.c @@ -33,7 +33,7 @@ #include #include #include -#ifdef HAVE_DRM_PLATFORM +#ifdef HAVE_LIBDRM #include #endif #include @@ -608,7 +608,7 @@ dri2_x11_authenticate(_EGLDisplay *disp, uint32_t id) static EGLBoolean dri2_authenticate(_EGLDisplay *disp) { -#ifdef HAVE_DRM_PLATFORM +#ifdef HAVE_LIBDRM struct dri2_egl_display *dri2_dpy = dri2_egl_display(disp); drm_magic_t magic; -- 1.8.1.4