gl: only enable gbm backend if gudev is available
authorTim-Philipp Müller <tim@centricular.com>
Mon, 5 Mar 2018 19:57:55 +0000 (19:57 +0000)
committerTim-Philipp Müller <tim@centricular.com>
Mon, 5 Mar 2018 20:00:34 +0000 (20:00 +0000)
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.

configure.ac
m4/gst-gl.m4

index 380413a..a01122c 100644 (file)
@@ -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
index bd6d173..1e97240 100644 (file)
@@ -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)