From 5a017f58c4bf1a9c4976793c727773bf15b62a7a Mon Sep 17 00:00:00 2001
From: Edward Hervey <edward@centricular.com>
Date: Wed, 3 Jan 2018 08:47:58 +0100
Subject: [PATCH] configure: Fix build without gl plugins

The AM_CONDITIONAL always need to be evaluated, regardless of
whether we are building with or without gl plugins (the actual
checks are only called in AG_GST_GL_PLUGIN_CHECKS).
---
 configure.ac | 4 +++-
 m4/gst-gl.m4 | 3 ---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 7e1dbc045d..88a217dbb7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -674,7 +674,9 @@ AG_GST_CHECK_FEATURE(GL, [gl elements], gl, [
     AG_GST_GL_PLUGIN_CHECKS
   fi
 ])
-
+AM_CONDITIONAL(HAVE_GRAPHENE, test "x$HAVE_GRAPHENE" = "xyes")
+AM_CONDITIONAL(HAVE_PNG, test "x$HAVE_PNG" = "xyes")
+AM_CONDITIONAL(HAVE_JPEG, test "x$HAVE_JPEG" = "xyes")
 
 dnl *** ivorbis ***
 dnl AM_PATH_IVORBIS only takes two options
diff --git a/m4/gst-gl.m4 b/m4/gst-gl.m4
index fd28039352..bbddd97dd4 100644
--- a/m4/gst-gl.m4
+++ b/m4/gst-gl.m4
@@ -989,7 +989,6 @@ fi
 AC_SUBST(HAVE_GRAPHENE)
 AC_SUBST(GRAPHENE_LIBS)
 AC_SUBST(GRAPHENE_CFLAGS)
-AM_CONDITIONAL(HAVE_GRAPHENE, test "x$HAVE_GRAPHENE" = "xyes")
 
 dnl Needed by plugins that use g_module_*() API
 dnl FIXME: probably not needed because AG_GST_CHECK_GLIB already includes it?
@@ -1003,7 +1002,6 @@ fi
 AC_SUBST(HAVE_PNG)
 AC_SUBST(LIBPNG_LIBS)
 AC_SUBST(LIBPNG_CFLAGS)
-AM_CONDITIONAL(HAVE_PNG, test "x$HAVE_PNG" = "xyes")
 
 dnl libjpeg is optional
 AC_ARG_WITH(jpeg-mmx, [  --with-jpeg-mmx, path to MMX'ified JPEG library])
@@ -1026,7 +1024,6 @@ else
 fi
 AC_SUBST(JPEG_LIBS)
 AC_SUBST(HAVE_JPEG)
-AM_CONDITIONAL(HAVE_JPEG, test "x$HAVE_JPEG" = "xyes")
 ])
 
 dnl --------------------------------------------------------------------------