summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Abriou <vincent.abriou@st.com>2014-10-29 10:09:35 +0100
committerMatthew Waters <matthew@centricular.com>2014-10-29 22:42:32 +1100
commitaad5b0d16646d708415120d4618385d9d70e450f (patch)
tree6253edd6e7f66e8d6cf053744f1731667336bc52
parent2bf3ba8060dcee64932ce7fb43273b5be34881a0 (diff)
downloadgstreamer-plugins-bad-aad5b0d16646d708415120d4618385d9d70e450f.tar.gz
configure.ac: auto decision to include GL library fails
The part of the configure.ac that consist to check if we can include both GL and GLES2 at the same time is failing. Indeed, in the case NEED_GLES2=yes and NEED_OPENGL=auto, HAVE_OPENGL variable is updated whereas it should be HAVE_GL variable that has to be updated (HAVE_OPENGL variable is not used in the rest of the configure.ac). https://bugzilla.gnome.org/show_bug.cgi?id=739348 Signed-off-by: Vincent Abriou <vincent.abriou@st.com> Reviewed-by: Benjamin GAIGNARD <benjamin.gaignard@linaro.org>
-rw-r--r--configure.ac2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index debccc725..01ee1773c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -880,7 +880,7 @@ if test "x$HAVE_GL" = "xyes" -a "x$HAVE_GLES2" = "xyes"; then
AC_MSG_ERROR([Cannot seem to include both GL and GLES2 headers. Try disabling one API])
fi
AC_MSG_WARN([Disabling Desktop GL support])
- HAVE_OPENGL=no
+ HAVE_GL=no
else
AC_MSG_WARN([Disabling GL|ES 2.0 support])
HAVE_GLES2=no