diff options
| author | Daniel Charles <daniel.charles@intel.com> | 2014-07-03 14:28:50 -0700 |
|---|---|---|
| committer | Xiang, Haihao <haihao.xiang@intel.com> | 2015-03-26 08:38:59 +0800 |
| commit | d0c6033bd937b72c2e056179e6d4b0d604884d47 (patch) | |
| tree | 7e45a12a25528aee9d7b69e675d86cbaed281bd8 | |
| parent | 185375bded4094ee534179b819ac4495c6ab37d2 (diff) | |
check that intel-gen4asm tool is actually present
intel-gen4asm tool has to be present on the host tools so that
it can actually be used. Cross compiling shows problems when the
gpu-tools version is met but the tool is not available on the PATH
So, first check that the tool is available and later check for version
before defining HAVE_GEN4ASM.
Signed-off-by: Daniel Charles <daniel.charles@intel.com>
(cherry picked from commit 038097c00ad7b4f2e0fd572ee20f255dd378b5cb)
Conflicts:
configure.ac
| -rw-r--r-- | configure.ac | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index bbff1f7..d71a3cc 100644 --- a/configure.ac +++ b/configure.ac @@ -78,8 +78,9 @@ AC_SUBST(LIBDRM_VERSION) dnl Check for gen4asm PKG_CHECK_MODULES(GEN4ASM, [intel-gen4asm >= 1.9], [gen4asm=yes], [gen4asm=no]) -AM_CONDITIONAL(HAVE_GEN4ASM, test x$gen4asm = xyes) AC_PATH_PROG([GEN4ASM], [intel-gen4asm]) +AS_IF([test "x$GEN4ASM" = "x" ], [AM_CONDITIONAL(HAVE_GEN4ASM, false)], + [AM_CONDITIONAL(HAVE_GEN4ASM, [test x$gen4asm = xyes])]) dnl Check for git AC_ARG_VAR([GIT], [Path to git program, if any]) |