diff options
| author | Xiang, Haihao <haihao.xiang@intel.com> | 2015-12-11 02:58:59 +0800 |
|---|---|---|
| committer | Xiang, Haihao <haihao.xiang@intel.com> | 2015-12-11 09:57:17 +0800 |
| commit | d6d1e231ebd76e5ee353f460b01ceda43f13e155 (patch) | |
| tree | fc2f550178c22298a41e4f751211739e75ea953f /configure.ac | |
| parent | af199eb763afcce467a66689049070bb416aeaa4 (diff) | |
| download | libva-d6d1e231ebd76e5ee353f460b01ceda43f13e155.tar.gz | |
Fix error caused by 'make distclean' with wayland disabled
This is based on Mesa's 426a23af147720ae3b89995ffee792a29e8ae2db.
v2: cleanup va/wayland/Makefile.am and nuke va/wayland/protocol/Makefile.am (Emil)
Cc: Emil Velikov <emil.l.velikov@gmail.com>
Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index b54eafe..6df246d 100644 --- a/configure.ac +++ b/configure.ac @@ -273,9 +273,10 @@ if test "$enable_wayland" = "yes"; then PKG_CHECK_MODULES([WAYLAND], [wayland-client >= wayland_api_version], [USE_WAYLAND="yes"], [:]) if test "$USE_WAYLAND" = "yes"; then - m4_ifdef([WAYLAND_SCANNER_RULES], - [WAYLAND_SCANNER_RULES(['$(top_builddir)/va/wayland/protocol'])], - [wayland_scanner_rules=""; AC_SUBST(wayland_scanner_rules)]) + + WAYLAND_PREFIX=`$PKG_CONFIG --variable=prefix wayland-client` + AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner],, + [${WAYLAND_PREFIX}/bin$PATH_SEPARATOR$PATH]) AC_DEFINE([HAVE_VA_WAYLAND], [1], [Defined to 1 if VA/Wayland API is built]) @@ -337,7 +338,6 @@ debian.upstream/libva-x11.install.in va/glx/Makefile va/va_version.h va/wayland/Makefile - va/wayland/protocol/Makefile va/x11/Makefile ]) |