diff options
| author | Tim-Philipp Müller <tim@centricular.com> | 2018-03-05 19:57:55 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.com> | 2018-03-05 20:00:34 +0000 |
| commit | 5f9c61e08f42602dff766db3ae5cb21a3dea9f3f (patch) | |
| tree | 4e18f237fd0917bee1d83b8fcec73bc515b8346e | |
| parent | 7d18a97273790f197788452a690eacfadff15237 (diff) | |
gl: only enable gbm backend if gudev is available
gudev/gudev.h is included unconditionally, so only enable
the gbm backend if gudev was actually found. This also
matches the meson build behaviour.
Should fix build on GNOME SDK builder.
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | m4/gst-gl.m4 | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 380413a88..a01122c49 100644 --- a/configure.ac +++ b/configure.ac @@ -295,14 +295,14 @@ GST_PREFIX="`$PKG_CONFIG --variable=prefix gstreamer-$GST_API_VERSION`" AC_SUBST(GLIB_PREFIX) AC_SUBST(GST_PREFIX) -AG_GST_GL_CHECKS - dnl check for gudev PKG_CHECK_MODULES(G_UDEV, gudev-1.0 , [ AC_DEFINE([HAVE_GUDEV], 1, [Define if gudev is installed]) HAVE_GUDEV="yes" ], [HAVE_GUDEV="no"]) +AG_GST_GL_CHECKS + dnl GTK is optional and only used in examples HAVE_GTK=no HAVE_GTK_X11=no diff --git a/m4/gst-gl.m4 b/m4/gst-gl.m4 index bd6d173f9..1e9724094 100644 --- a/m4/gst-gl.m4 +++ b/m4/gst-gl.m4 @@ -176,7 +176,7 @@ case $host in 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 + if test "x$HAVE_DRM" = "xyes" -a "x$HAVE_GUDEV" = "xyes"; then PKG_CHECK_MODULES(GBM, gbm, HAVE_GBM_EGL=yes, HAVE_GBM_EGL=no) AC_SUBST(GBM_CFLAGS) AC_SUBST(GBM_LIBS) |