summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stone <daniels@collabora.com>2017-09-20 07:22:12 -0700
committerAdam Jackson <ajax@redhat.com>2017-09-20 13:25:46 -0400
commit86a89dd6020f59964c0e924acbfae9d5a51e3148 (patch)
tree77087846674ae9f0c1ce63900750f3bf01d66450
parent294670682120c65001b36369d6395003704f4ac1 (diff)
Build: Use dri3proto/libdrm CFLAGS
Make sure we get the CFLAGS required for building DRI3 into the command line. Signed-off-by: Daniel Stone <daniels@collabora.com>
-rw-r--r--configure.ac1
-rw-r--r--dri3/meson.build2
2 files changed, 2 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index f13a54ab9..ec98f52c0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1197,6 +1197,7 @@ PKG_CHECK_MODULES([DRI3PROTO], $DRI3PROTO,
case "$DRI3,$HAVE_DRI3PROTO" in
yes,yes | auto,yes)
+ REQUIRED_MODULES="$REQUIRED_MODULES dri3proto"
;;
yes,no)
AC_MSG_ERROR([DRI3 requested, but dri3proto not found.])
diff --git a/dri3/meson.build b/dri3/meson.build
index 3d05020e6..0deec32aa 100644
--- a/dri3/meson.build
+++ b/dri3/meson.build
@@ -9,7 +9,7 @@ if build_dri3
libxserver_dri3 = static_library('libxserver_dri3',
srcs_dri3,
include_directories: inc,
- dependencies: common_dep,
+ dependencies: [ common_dep, libdrm_dep ],
c_args: '-DHAVE_XORG_CONFIG_H'
)
endif