diff options
author | Arnaud Vrac <avrac@freebox.fr> | 2015-08-19 15:31:16 +0200 |
---|---|---|
committer | Sebastian Dröge <sebastian@centricular.com> | 2015-08-19 16:52:03 +0300 |
commit | 697f117ddda44d0386e46e082dbd6190d837db2a (patch) | |
tree | 53c384c315eeb7d552e3e5bcf0480decf0da5db4 /sys | |
parent | 2ebebdbfbb7f5cfa7b438bb6b02fc723c9349d51 (diff) | |
download | gstreamer-plugins-bad-697f117ddda44d0386e46e082dbd6190d837db2a.tar.gz |
configure.ac: fix build when the uvch264 plugin is not selected
Instead of checking for the gstreamer-video-1.0 package is installed,
just assume it is since we already check for the -base dependency.
With this replace the GST_VIDEO_* variables in makefiles and directly
link with libgstvideo.
https://bugzilla.gnome.org/show_bug.cgi?id=753820
Diffstat (limited to 'sys')
-rw-r--r-- | sys/uvch264/Makefile.am | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sys/uvch264/Makefile.am b/sys/uvch264/Makefile.am index aec14556b..6af247498 100644 --- a/sys/uvch264/Makefile.am +++ b/sys/uvch264/Makefile.am @@ -8,7 +8,6 @@ libgstuvch264_la_SOURCES = gstuvch264.c \ libgstuvch264_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) \ $(GST_PLUGINS_BASE_CFLAGS) \ $(GST_BASE_CFLAGS) \ - $(GST_VIDEO_CFLAGS) \ $(GST_CFLAGS) \ $(G_UDEV_CFLAGS) \ $(LIBUSB_CFLAGS) \ @@ -18,9 +17,8 @@ libgstuvch264_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstuvch264_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS) libgstuvch264_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \ + -lgstvideo-$(GST_API_VERSION) \ $(GST_BASE_LIBS) \ - $(GST_PLUGINS_BASE_LIBS) \ - $(GST_VIDEO_LIBS) \ $(GST_LIBS) \ $(G_UDEV_LIBS) \ $(LIBUSB_LIBS) \ |