From 74a8b320fa5068cd86d8b8b8e73fa92caae9a8a6 Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Thu, 29 Sep 2016 18:35:02 +0100 Subject: [PATCH] configure.ac: use $LIBDRM over libdrm when using pkg-config The former contains the minimum required version which is required. Strictly speaking Xephyr/Xwayland may require version greater than the current 2.3.0, although I've personally haven't checked the specifics. Signed-off-by: Emil Velikov Reviewed-by: Adam Jackson --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 7a8187eb6..6bf7b8378 100644 --- a/configure.ac +++ b/configure.ac @@ -2445,7 +2445,7 @@ if test "$KDRIVE" = yes; then XEPHYR_REQUIRED_LIBS="$XEPHYR_REQUIRED_LIBS xcb-xv" fi if test "x$DRI" = xyes && test "x$GLX" = xyes; then - XEPHYR_REQUIRED_LIBS="$XEPHYR_REQUIRED_LIBS libdrm xcb-glx xcb-xf86dri > 1.6" + XEPHYR_REQUIRED_LIBS="$XEPHYR_REQUIRED_LIBS $LIBDRM xcb-glx xcb-xf86dri > 1.6" fi if test "x$GLAMOR" = xyes; then XEPHYR_REQUIRED_LIBS="$XEPHYR_REQUIRED_LIBS x11-xcb" @@ -2499,7 +2499,7 @@ AM_CONDITIONAL(XFAKESERVER, [test "x$KDRIVE" = xyes && test "x$XFAKE" = xyes]) dnl Xwayland DDX -XWAYLANDMODULES="wayland-client >= 1.3.0 wayland-protocols >= 1.1 libdrm epoxy" +XWAYLANDMODULES="wayland-client >= 1.3.0 wayland-protocols >= 1.1 $LIBDRM epoxy" if test "x$XF86VIDMODE" = xyes; then XWAYLANDMODULES="$XWAYLANDMODULES $VIDMODEPROTO" fi