debian: Remove legacy packaging

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

diff --git a/configure.ac b/configure.ac
index 57bb36c..540bdce 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -27,7 +27,7 @@
 # - 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_minor_version], [40])
 m4_define([va_api_micro_version], [0])
 
 m4_define([va_api_version],
@@ -43,7 +43,7 @@ m4_define([va_api_version],
 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], [0])
-m4_define([libva_pre_version],   [0])
+m4_define([libva_pre_version],   [1])
 
 m4_define([libva_version],
           [libva_major_version.libva_minor_version.libva_micro_version])
@@ -81,7 +81,12 @@ m4_define([libdrm_version], [2.4])
 m4_define([wayland_api_version], [1.0.0])
 
 AC_PREREQ(2.57)
-AC_INIT([libva], [libva_version], [waldo.bastian@intel.com], libva)
+AC_INIT([libva],
+        [libva_version],
+        [https://github.com/01org/libva/issues/new],
+        [libva],
+        [https://github.com/01org/libva])
+
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_MACRO_DIR([m4])
 AM_INIT_AUTOMAKE([dist-bzip2])
@@ -273,15 +278,17 @@ if test "$enable_wayland" = "yes"; then
     PKG_CHECK_MODULES([WAYLAND], [wayland-client >= wayland_api_version],
         [USE_WAYLAND="yes"], [:])
     if test "$USE_WAYLAND" = "yes"; then
+
+        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])
     fi
 fi
-AM_CONDITIONAL(USE_WAYLAND, test "$USE_WAYLAND" = "yes")
 
-m4_ifdef([WAYLAND_SCANNER_RULES],
-    [WAYLAND_SCANNER_RULES(['$(top_builddir)/va/wayland/protocol'])],
-    [wayland_scanner_rules=""; AC_SUBST(wayland_scanner_rules)])
+AM_CONDITIONAL(USE_WAYLAND, test "$USE_WAYLAND" = "yes")
 
 pkgconfigdir=${libdir}/pkgconfig
 AC_SUBST(pkgconfigdir)
@@ -298,21 +305,6 @@ AC_DEFINE_UNQUOTED([VA_DRIVER_INIT_FUNC], [$VA_DRIVER_INIT_FUNC],
 
 AC_OUTPUT([
     Makefile
-    debian.upstream/Makefile
-    debian.upstream/changelog
-    debian.upstream/control
-    debian.upstream/libva$LIBVA_MAJOR_VERSION.install:\
-debian.upstream/libva.install.in
-    debian.upstream/libva-drm$LIBVA_MAJOR_VERSION.install:\
-debian.upstream/libva-drm.install.in
-    debian.upstream/libva-egl$LIBVA_MAJOR_VERSION.install:\
-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
     dummy_drv_video/Makefile
     pkgconfig/Makefile
@@ -323,20 +315,12 @@ debian.upstream/libva-x11.install.in
     pkgconfig/libva-wayland.pc
     pkgconfig/libva-x11.pc
     pkgconfig/libva.pc
-    test/Makefile
-    test/basic/Makefile
-    test/common/Makefile
-    test/decode/Makefile
-    test/encode/Makefile
-    test/putsurface/Makefile
-    test/vainfo/Makefile
     va/Makefile
     va/drm/Makefile
     va/egl/Makefile
     va/glx/Makefile
     va/va_version.h
     va/wayland/Makefile
-    va/wayland/protocol/Makefile
     va/x11/Makefile
 ])