github: Use correct travis svg and coverity project id

[android-x86/hardware-intel-common-libva.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index f835bef..dd0c611 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -27,8 +27,8 @@
 # - reset micro version to zero when minor version is incremented
 # - reset minor version to zero when major version is incremented
 m4_define([va_api_major_version], [0])
-m4_define([va_api_minor_version], [38])
-m4_define([va_api_micro_version], [1])
+m4_define([va_api_minor_version], [40])
+m4_define([va_api_micro_version], [0])
 
 m4_define([va_api_version],
           [va_api_major_version.va_api_minor_version.va_api_micro_version])
@@ -42,7 +42,7 @@ m4_define([va_api_version],
 # - reset micro version to zero when VA-API major or minor version is changed
 m4_define([libva_major_version], [m4_eval(va_api_major_version + 1)])
 m4_define([libva_minor_version], [m4_eval(va_api_minor_version - 32)])
-m4_define([libva_micro_version], [2])
+m4_define([libva_micro_version], [0])
 m4_define([libva_pre_version],   [1])
 
 m4_define([libva_version],
@@ -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])
@@ -310,6 +311,8 @@ debian.upstream/libva-drm.install.in
 debian.upstream/libva-egl.install.in
     debian.upstream/libva-glx$LIBVA_MAJOR_VERSION.install:\
 debian.upstream/libva-glx.install.in
+    debian.upstream/libva-wayland$LIBVA_MAJOR_VERSION.install:\
+debian.upstream/libva-wayland.install.in
     debian.upstream/libva-x11-$LIBVA_MAJOR_VERSION.install:\
 debian.upstream/libva-x11.install.in
     doc/Makefile
@@ -319,6 +322,7 @@ debian.upstream/libva-x11.install.in
     pkgconfig/libva-egl.pc
     pkgconfig/libva-glx.pc
     pkgconfig/libva-tpi.pc
+    pkgconfig/libva-wayland.pc
     pkgconfig/libva-x11.pc
     pkgconfig/libva.pc
     test/Makefile
@@ -333,18 +337,9 @@ debian.upstream/libva-x11.install.in
     va/egl/Makefile
     va/glx/Makefile
     va/va_version.h
-    va/x11/Makefile
-])
-
-if test "$USE_WAYLAND" = "yes"; then
-AC_OUTPUT([
-    debian.upstream/libva-wayland$LIBVA_MAJOR_VERSION.install:\
-debian.upstream/libva-wayland.install.in
-    pkgconfig/libva-wayland.pc
     va/wayland/Makefile
-    va/wayland/protocol/Makefile
+    va/x11/Makefile
 ])
-fi
 
 # Print a small summary
 BACKENDS=""