Commit 5a017f58 authored by Edward Hervey's avatar Edward Hervey Committed by Edward Hervey

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).
parent 81f82573
......@@ -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
......
......@@ -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 --------------------------------------------------------------------------
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment