diff options
| author | Víctor Manuel Jáquez Leal <vjaquez@igalia.com> | 2018-01-22 15:34:09 +0100 |
|---|---|---|
| committer | Xiang, Haihao <haihao.xiang@intel.com> | 2018-02-11 19:35:46 +0800 |
| commit | 3e19c9098525642863e285a2b0039a3ef303b55b (patch) | |
| tree | 0aa0eea1fcb81b691a1a9e7da9b73aaff8a624b1 /configure.ac | |
| parent | 958a18073942ac18c627d2e48865292d3df66390 (diff) | |
| download | libva-intel-driver-3e19c9098525642863e285a2b0039a3ef303b55b.tar.gz | |
build: autotools: clean check for wayland dependency
Clean up the the checks for wayland dependencies.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/configure.ac b/configure.ac index 747f0117..9beca1d8 100644 --- a/configure.ac +++ b/configure.ac @@ -129,7 +129,7 @@ AC_DEFINE_UNQUOTED([VA_DRIVER_INIT_FUNC], [$VA_DRIVER_INIT_FUNC], dnl Check for VA/X11 API USE_X11="$enable_x11" if test "$USE_X11" = "yes"; then - PKG_CHECK_MODULES(LIBVA_X11_DEPS, [libva-x11], + PKG_CHECK_MODULES(LIBVA_X11_DEPS, [libva-x11 >= va_api_version], [AC_DEFINE([HAVE_VA_X11], [1], [Defined to 1 if VA/X11 API is enabled])], [USE_X11="no"]) fi @@ -150,19 +150,21 @@ AC_SUBST(LIBVA_DRIVERS_PATH) # Check for Wayland USE_WAYLAND="no" if test "$enable_wayland" = "yes"; then - PKG_CHECK_MODULES([LIBVA_WAYLAND_DEPS], [libva-wayland], - [USE_WAYLAND="yes"], [:]) - + PKG_CHECK_MODULES([LIBVA_WAYLAND_DEPS], [libva-wayland >= va_api_version], + [ + PKG_CHECK_MODULES([WAYLAND_CLIENT], + [wayland-client >= wayland_api_version], + [ + USE_WAYLAND="yes" + WAYLAND_PREFIX=`$PKG_CONFIG --variable=prefix wayland-client` + AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], + [USE_ WAYLAND="no"], + [${WAYLAND_PREFIX}/bin$PATH_SEPARATOR$PATH]) + ], [:]) + ], [:]) if test "$USE_WAYLAND" = "yes"; then - - PKG_CHECK_MODULES([WAYLAND_CLIENT], [wayland-client >= wayland_api_version], - [INCLUDES="$INCLUDES $WAYLAND_CLIENT_CFLAGS"], [:]) - 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 enabled]) + AC_DEFINE([HAVE_VA_WAYLAND], [1], + [Defined to 1 if VA/Wayland API is enabled]) fi fi AM_CONDITIONAL(USE_WAYLAND, test "$USE_WAYLAND" = "yes") |