fix typo in upstream code

[profile/ivi/vaapi-intel-driver.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index efb2841..0538b38 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 # intel-driver package version number
 m4_define([intel_driver_major_version], [1])
 m4_define([intel_driver_minor_version], [0])
-m4_define([intel_driver_micro_version], [16])
+m4_define([intel_driver_micro_version], [19])
 m4_define([intel_driver_pre_version],   [1])
 m4_define([intel_driver_version],
           [intel_driver_major_version.intel_driver_minor_version.intel_driver_micro_version])
@@ -18,7 +18,7 @@ m4_define([libdrm_version], [2.4.23])
 
 AC_PREREQ([2.57])
 AC_INIT([intel_driver], [intel_driver_version], [haihao.xiang@intel.com],
-        [libva-driver-intel])
+        [libva-intel-driver])
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([1.9 tar-ustar])
 
@@ -64,6 +64,8 @@ AM_PROG_CC_C_O
 AC_C_BIGENDIAN
 AC_HEADER_STDC
 AC_SYS_LARGEFILE
+AC_CHECK_LIB([m], [sin])
+AC_CHECK_FUNCS([log2f])
 
 LIBVA_PACKAGE_VERSION=libva_package_version
 AC_SUBST(LIBVA_PACKAGE_VERSION)
@@ -151,21 +153,17 @@ AM_CONDITIONAL(USE_EGL, test "$USE_EGL" = "yes")
 
 # Check for Wayland
 USE_WAYLAND="no"
-WAYLAND_DRM_CFLAGS=""
-WAYLAND_DRM_LIBS=""
 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"])
-    if test "$USE_EGL" = "yes"; then
-        WAYLAND_DRM_CFLAGS="$DRM_CFLAGS"
-        WAYLAND_DRM_LIBS="$DRM_LIBS $EGL_LIBS"
-    fi
 fi
 AM_CONDITIONAL(USE_WAYLAND, test "$USE_WAYLAND" = "yes")
-AC_SUBST([WAYLAND_DRM_CFLAGS])
-AC_SUBST([WAYLAND_DRM_LIBS])
+
+m4_ifdef([WAYLAND_SCANNER_RULES],
+    [WAYLAND_SCANNER_RULES(['$(top_srcdir)/src/wayland'])],
+    [wayland_scanner_rules=""; AC_SUBST(wayland_scanner_rules)])
 
 AC_OUTPUT([
     Makefile
@@ -183,6 +181,7 @@ AC_OUTPUT([
     src/shaders/render/Makefile
     src/shaders/utils/Makefile
     src/shaders/vme/Makefile
+    src/wayland/Makefile
 ])
 
 dnl Print summary