diff options
| author | Mart Raudsepp <leio@gentoo.org> | 2014-07-16 16:31:27 +0300 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2014-07-16 16:37:54 +0200 |
| commit | 96aa9316357e26f69790e296d3627718b6ca709e (patch) | |
| tree | 359d06dc2688447ab7115b9b37ce80142f1885cb | |
| parent | 0bb6d22ffc094dcbe2f41d2b037b4f038d158636 (diff) | |
| download | gstreamer-plugins-bad-96aa9316357e26f69790e296d3627718b6ca709e.tar.gz | |
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
| -rw-r--r-- | configure.ac | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 1717df2a7..b16e1f8fa 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 |