diff options
| author | Nicolas Dufresne <nicolas.dufresne@collabora.com> | 2018-02-27 13:12:59 -0500 |
|---|---|---|
| committer | Nicolas Dufresne <nicolas.dufresne@collabora.com> | 2018-02-27 13:12:59 -0500 |
| commit | fbc2375d57ec07db75e2d73b4a6c672c3c83f040 (patch) | |
| tree | 4286732cd162918a434ace19bf87d0cce8be1bd6 | |
| parent | b8bc2b87d056b050dcec19e94e19ee2bd7907a35 (diff) | |
gl: Move DRM_CFLAGS into gst-gl.m4
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | gst-libs/gst/gl/Makefile.am | 1 | ||||
| -rw-r--r-- | m4/gst-gl.m4 | 16 |
3 files changed, 10 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac index f860d9e30..e333cc33c 100644 --- a/configure.ac +++ b/configure.ac @@ -295,9 +295,6 @@ GST_PREFIX="`$PKG_CONFIG --variable=prefix gstreamer-$GST_API_VERSION`" AC_SUBST(GLIB_PREFIX) AC_SUBST(GST_PREFIX) -dnl check for libdrm -PKG_CHECK_MODULES(DRM, libdrm >= 2.4.55, HAVE_DRM=yes, HAVE_DRM=no) - AG_GST_GL_CHECKS dnl check for gudev diff --git a/gst-libs/gst/gl/Makefile.am b/gst-libs/gst/gl/Makefile.am index 0a8910e00..f5ab0ece3 100644 --- a/gst-libs/gst/gl/Makefile.am +++ b/gst-libs/gst/gl/Makefile.am @@ -154,7 +154,6 @@ libgstgl_@GST_API_VERSION@_la_CFLAGS = \ $(GST_PLUGINS_BASE_CFLAGS) \ $(GST_BASE_CFLAGS) \ $(GST_CFLAGS) \ - $(DRM_CFLAGS) \ $(GL_CFLAGS) libgstgl_@GST_API_VERSION@_la_LDFLAGS = \ diff --git a/m4/gst-gl.m4 b/m4/gst-gl.m4 index ffca666e2..809217f94 100644 --- a/m4/gst-gl.m4 +++ b/m4/gst-gl.m4 @@ -172,10 +172,15 @@ case $host in AC_CHECK_LIB([EGL], [fbGetDisplay], [HAVE_VIV_FB_EGL=yes]) fi - if test "x$HAVE_EGL" = "xyes" -a "x$HAVE_DRM" = "xyes"; then - PKG_CHECK_MODULES(GBM, gbm, HAVE_GBM_EGL=yes, HAVE_GBM_EGL=no) - AC_SUBST(GBM_CFLAGS) - AC_SUBST(GBM_LIBS) + if test "x$HAVE_EGL" = "xyes"; then + PKG_CHECK_MODULES(DRM, libdrm >= 2.4.55, HAVE_DRM=yes, HAVE_DRM=no) + AC_SUBST(DRM_CFLAGS) + AC_SUBST(DRM_LIBS) + if test "x$HAVE_DRM" = "xyes"; then + PKG_CHECK_MODULES(GBM, gbm, HAVE_GBM_EGL=yes, HAVE_GBM_EGL=no) + AC_SUBST(GBM_CFLAGS) + AC_SUBST(GBM_LIBS) + fi fi dnl FIXME: Mali EGL depends on GLESv1 or GLESv2 @@ -479,8 +484,7 @@ case $host in AC_MSG_WARN([EGL is required by the Mesa GBM EGL backend]) else HAVE_WINDOW_GBM=yes - GL_LIBS="$GL_LIBS" - GL_CFLAGS="$GL_CFLAGS" + GL_CFLAGS="$GL_CFLAGS DRM_CFLAGS" fi fi |