Android: fix Android build

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

diff --git a/configure.ac b/configure.ac
index c5210d3..f56a9f4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,8 @@
 # intel-driver package version number
 m4_define([intel_driver_major_version], [1])
-m4_define([intel_driver_minor_version], [6])
+m4_define([intel_driver_minor_version], [7])
 m4_define([intel_driver_micro_version], [1])
-m4_define([intel_driver_pre_version],   [1])
+m4_define([intel_driver_pre_version],   [0])
 m4_define([intel_driver_version],
           [intel_driver_major_version.intel_driver_minor_version.intel_driver_micro_version])
 m4_if(intel_driver_pre_version, [0], [], [
@@ -10,11 +10,11 @@ m4_append([intel_driver_version], intel_driver_pre_version, [.pre])
 ])
 
 # libva minimum version requirement
-m4_define([va_api_version], [0.38])
-m4_define([libva_package_version], [1.6.0])
+m4_define([va_api_version], [0.39.2])
+m4_define([libva_package_version], [1.7.1])
 
 # libdrm minimum version requirement
-m4_define([libdrm_version], [2.4.45])
+m4_define([libdrm_version], [2.4.52])
 
 AC_PREREQ([2.57])
 AC_INIT([intel_driver], [intel_driver_version], [haihao.xiang@intel.com],
@@ -56,6 +56,11 @@ AC_ARG_ENABLE([wayland],
                     [build with VA/Wayland API support @<:@default=yes@:>@])],
     [], [enable_wayland="yes"])
 
+AC_ARG_ENABLE([hybrid-codec],
+    [AC_HELP_STRING([--enable-hybrid-codec],
+                    [build with hybrid codec support @<:@default=no@:>@])],
+    [], [enable_hybrid_codec="no"])
+
 AC_DISABLE_STATIC
 AC_PROG_LIBTOOL
 AC_PROG_CC
@@ -107,6 +112,10 @@ if test "$USE_DRM" = "yes"; then
 fi
 AM_CONDITIONAL(USE_DRM, test "$USE_DRM" = "yes")
 
+if test "$enable_hybrid_codec" = "yes"; then
+    AC_DEFINE([HAVE_HYBRID_CODEC], [1], [Defined to 1 if hybrid codec is needed])
+fi
+
 VA_VERSION=`$PKG_CONFIG --modversion libva`
 VA_MAJOR_VERSION=`echo "$VA_VERSION" | cut -d'.' -f1`
 VA_MINOR_VERSION=`echo "$VA_VERSION" | cut -d'.' -f2`
@@ -164,17 +173,21 @@ AM_CONDITIONAL(USE_EGL, test "$USE_EGL" = "yes")
 # Check for Wayland
 USE_WAYLAND="no"
 if test "$enable_wayland" = "yes"; then
-    PKG_CHECK_MODULES([WAYLAND], [wayland-client], [USE_WAYLAND="yes"], [:])
     PKG_CHECK_MODULES([LIBVA_WAYLAND_DEPS], [libva-wayland],
-        [AC_DEFINE([HAVE_VA_WAYLAND], [1], [Defined to 1 if VA/Wayland API is enabled])],
-        [USE_WAYLAND="no"])
+        [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 enabled])
+    fi
 fi
 AM_CONDITIONAL(USE_WAYLAND, test "$USE_WAYLAND" = "yes")
 
-m4_ifdef([WAYLAND_SCANNER_RULES],
-    [WAYLAND_SCANNER_RULES(['$(top_builddir)/src/wayland'])],
-    [wayland_scanner_rules=""; AC_SUBST(wayland_scanner_rules)])
-
 AC_OUTPUT([
     Makefile
     debian.upstream/Makefile 
@@ -194,7 +207,6 @@ AC_OUTPUT([
     src/shaders/render/Makefile
     src/shaders/utils/Makefile
     src/shaders/vme/Makefile
-    src/wayland/Makefile
 ])
 
 dnl Print summary