From: Mart Raudsepp <leio@gentoo.org>
Date: Wed, 16 Jul 2014 13:31:27 +0000 (+0300)
Subject: gl: Include GL_CFLAGS while checking for GL typedefs
X-Git-Tag: 1.19.3~507^2~10581
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=96aa9316357e26f69790e296d3627718b6ca709e;p=platform%2Fupstream%2Fgstreamer.git

gl: Include GL_CFLAGS while checking for GL typedefs

Otherwise those checks may fail at configure time if they contain extra
include paths, while at build time they are included, potentially causing
incompatible typedefs between system GL headers and gstreamer compatibility
prototypes.

https://bugzilla.gnome.org/show_bug.cgi?id=733248
---

diff --git a/configure.ac b/configure.ac
index 1717df2..b16e1f8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1327,6 +1327,9 @@ GST_GL_HAVE_GLCHAR=0
 GST_GL_HAVE_GLSIZEIPTR=0
 GST_GL_HAVE_GLINTPTR=0
 
+old_CFLAGS=$CFLAGS
+CFLAGS="$GL_CFLAGS $CFLAGS"
+
 AC_CHECK_TYPES(GLeglImageOES, [], [], [[$GL_INCLUDES]])
 if test "x$ac_cv_type_GLeglImageOES" = "xyes"; then
   GST_GL_HAVE_GLEGLIMAGEOES=1
@@ -1347,6 +1350,8 @@ if test "x$ac_cv_type_GLintptr" = "xyes"; then
   GST_GL_HAVE_GLINTPTR=1
 fi
 
+CFLAGS=$old_CFLAGS
+
 GL_CONFIG_DEFINES="$GL_CONFIG_DEFINES
 #define GST_GL_HAVE_GLEGLIMAGEOES $GST_GL_HAVE_GLEGLIMAGEOES
 #define GST_GL_HAVE_GLCHAR $GST_GL_HAVE_GLCHAR