diff options
| author | Bryce Harrington <bryce@osg.samsung.com> | 2015-08-14 12:44:50 -0700 |
|---|---|---|
| committer | Bryce Harrington <bryce@osg.samsung.com> | 2015-08-14 12:45:38 -0700 |
| commit | cb512c018e8db66574b4e0d1263c52a05267918c (patch) | |
| tree | 631927518c06782c666700c73cd0c2f9018bcbe3 | |
| parent | a358207572f3fb98e42128aeeb71cb9fea3d2b23 (diff) | |
Fix armhf configure breakage due to missing libdrm_intel package
The buildbots discovered that recent changes break on Ubuntu 15.04's
armhf images:
configure:16137: checking for SIMPLE_DMABUF_CLIENT
configure:16144: $PKG_CONFIG --exists --print-errors "wayland-client libdrm libdrm_intel"
Package libdrm_intel was not found in the pkg-config search path.
...
configure:16194: error: Package requirements (wayland-client libdrm libdrm_intel) were not met:
No package 'libdrm_intel' found
This patch was provided by Daniel Stone. I've not tested it other than
verifying it does not cause build problems on x86_64.
Acked-by: Bryce Harrington <bryce@osg.samsung.com>
| -rw-r--r-- | configure.ac | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index e610e2d1..64d2d130 100644 --- a/configure.ac +++ b/configure.ac @@ -341,11 +341,15 @@ fi AC_ARG_ENABLE(simple-intel-dmabuf-client, AS_HELP_STRING([--disable-simple-intel-dmabuf-client], [do not build the simple intel dmabuf client]),, - enable_simple_intel_dmabuf_client="yes") -AM_CONDITIONAL(BUILD_SIMPLE_INTEL_DMABUF_CLIENT, test "x$enable_simple_intel_dmabuf_client" = "xyes") -if test "x$enable_simple_intel_dmabuf_client" = "xyes"; then - PKG_CHECK_MODULES(SIMPLE_DMABUF_CLIENT, [wayland-client libdrm libdrm_intel]) + enable_simple_intel_dmabuf_client="auto") +if ! test "x$enable_simple_intel_dmabuf_client" = "xno"; then + PKG_CHECK_MODULES(SIMPLE_DMABUF_CLIENT, [wayland-client libdrm libdrm_intel], + have_simple_dmabuf_client=yes, have_simple_dmabuf_client=no) + if test "x$have_simple_dmabuf_client" = "xno" -a "x$enable_simple_intel_dmabuf_client" = "xyes"; then + AC_MSG_ERROR([Intel dmabuf client explicitly enabled, but libdrm_intel couldn't be found]) + fi fi +AM_CONDITIONAL(BUILD_SIMPLE_INTEL_DMABUF_CLIENT, test "x$enable_simple_intel_dmabuf_client" = "xyes") AC_ARG_ENABLE(clients, [ --enable-clients],, enable_clients=yes) AM_CONDITIONAL(BUILD_CLIENTS, test x$enable_clients = xyes) |