mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-25 01:30:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

configure: Fix build without gl plugins

Browse source 
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).
This commit is contained in:
Edward Hervey 2018-01-03 08:47:58 +01:00 committed by Edward Hervey
parent 81f8257354
commit 5a017f58c4
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
configure.ac
View file

@ -674,7 +674,9 @@ AG_GST_CHECK_FEATURE(GL, [gl elements], gl, [
AG_GST_GL_PLUGIN_CHECKS AG_GST_GL_PLUGIN_CHECKS
fi 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 *** ivorbis ***
dnl AM_PATH_IVORBIS only takes two options dnl AM_PATH_IVORBIS only takes two options

3
m4/gst-gl.m4
View file

@ -989,7 +989,6 @@ fi
AC_SUBST(HAVE_GRAPHENE) AC_SUBST(HAVE_GRAPHENE)
AC_SUBST(GRAPHENE_LIBS) AC_SUBST(GRAPHENE_LIBS)
AC_SUBST(GRAPHENE_CFLAGS) AC_SUBST(GRAPHENE_CFLAGS)
AM_CONDITIONAL(HAVE_GRAPHENE, test "x$HAVE_GRAPHENE" = "xyes")
dnl Needed by plugins that use g_module_*() API dnl Needed by plugins that use g_module_*() API
dnl FIXME: probably not needed because AG_GST_CHECK_GLIB already includes it? dnl FIXME: probably not needed because AG_GST_CHECK_GLIB already includes it?
@ -1003,7 +1002,6 @@ fi
AC_SUBST(HAVE_PNG) AC_SUBST(HAVE_PNG)
AC_SUBST(LIBPNG_LIBS) AC_SUBST(LIBPNG_LIBS)
AC_SUBST(LIBPNG_CFLAGS) AC_SUBST(LIBPNG_CFLAGS)
AM_CONDITIONAL(HAVE_PNG, test "x$HAVE_PNG" = "xyes")
dnl libjpeg is optional dnl libjpeg is optional
AC_ARG_WITH(jpeg-mmx, [ --with-jpeg-mmx, path to MMX'ified JPEG library]) AC_ARG_WITH(jpeg-mmx, [ --with-jpeg-mmx, path to MMX'ified JPEG library])
@ -1026,7 +1024,6 @@ else
fi fi
AC_SUBST(JPEG_LIBS) AC_SUBST(JPEG_LIBS)
AC_SUBST(HAVE_JPEG) AC_SUBST(HAVE_JPEG)
AM_CONDITIONAL(HAVE_JPEG, test "x$HAVE_JPEG" = "xyes")
]) ])
dnl -------------------------------------------------------------------------- dnl --------------------------------------------------------------------------