summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXiang, Haihao <haihao.xiang@intel.com>2012-01-13 11:13:34 +0800
committerXiang, Haihao <haihao.xiang@intel.com>2012-01-13 11:13:34 +0800
commitba69d8af4f6c81a73d1da5d0c9dae77cf2da1758 (patch)
treee0788029c56a3e252ea386c3aaa978fca80ee986
parentf0e7788c32013ec71c45ed82b8bfba0b6c602fe3 (diff)
parentf908ee08ef94a6b204103c19bda7edf2a6a24379 (diff)
Merge branch 'master' into vaapi-ext
-rw-r--r--configure.ac2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 7d5a6ee..0acee07 100644
--- a/configure.ac
+++ b/configure.ac
@@ -208,7 +208,7 @@ fi
AC_SUBST(EGL_DEPS_CFLAGS)
AC_SUBST(EGL_DEPS_LIBS)
AM_CONDITIONAL(USE_EGL, test "$USE_EGL" = "yes")
-AM_CONDITIONAL(BUILD_EGL_TEST, test x$libglesv1_cm = xyes)
+AM_CONDITIONAL(BUILD_EGL_TEST, [test "x$USE_EGL" = "xyes" && test "x$libglesv1_cm" = "xyes"])
# We only need the headers, we don't link against the DRM libraries
LIBVA_CFLAGS="$DRM_CFLAGS"