diff options
| author | Xiang, Haihao <haihao.xiang@intel.com> | 2012-01-12 16:48:21 +0800 |
|---|---|---|
| committer | Xiang, Haihao <haihao.xiang@intel.com> | 2012-01-12 16:48:21 +0800 |
| commit | af135e2510905bdb3932fc65bf6364118a7740d9 (patch) | |
| tree | a0f24e2bd62436e80deb1982c4d03ddac5fae6ee /configure.ac | |
| parent | 828b8da304619ec68558b9064be964ac5e47f99e (diff) | |
| parent | fe140f03726c603f4802e4977621b46f03fe4d3c (diff) | |
| download | vaapi-intel-driver-af135e2510905bdb3932fc65bf6364118a7740d9.tar.gz vaapi-intel-driver-af135e2510905bdb3932fc65bf6364118a7740d9.tar.bz2 vaapi-intel-driver-af135e2510905bdb3932fc65bf6364118a7740d9.zip | |
Merge branch 'master' into vaapi-ext
Conflicts:
.gitignore
src/i965_drv_video.c
src/shaders/post_processing/Makefile.am
Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 4fc1dfc..147f3aa 100644 --- 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], [15]) +m4_define([intel_driver_micro_version], [16]) m4_define([intel_driver_pre_version], [1]) m4_define([intel_driver_version], [intel_driver_major_version.intel_driver_minor_version.intel_driver_micro_version]) @@ -60,6 +60,7 @@ AC_SUBST(LIBDRM_VERSION) dnl Check for gen4asm PKG_CHECK_MODULES(GEN4ASM, [intel-gen4asm >= 1.2], [gen4asm=yes], [gen4asm=no]) AM_CONDITIONAL(HAVE_GEN4ASM, test x$gen4asm = xyes) +AC_PATH_PROG([GEN4ASM], [intel-gen4asm]) dnl Check for VA-API PKG_CHECK_MODULES(LIBVA_DEPS, [libva]) |