mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-10-05 02:02:26 +00:00
fixes for new pkg-config files in gst-plugins-base
Original commit message from CVS: fixes for new pkg-config files in gst-plugins-base
This commit is contained in:
parent
b87df5e460
commit
94e9812b6b
4 changed files with 14 additions and 11 deletions
2
common
2
common
|
@ -1 +1 @@
|
||||||
Subproject commit 2826306411790bf8aa9298922aa59b126897431f
|
Subproject commit 4ca96aedcf2be0b3dcf31fce732aed1da21b8850
|
13
configure.ac
13
configure.ac
|
@ -256,15 +256,16 @@ AC_SUBST(GST_INTERFACES_LIBS)
|
||||||
AC_SUBST(GST_INTERFACES_CFLAGS)
|
AC_SUBST(GST_INTERFACES_CFLAGS)
|
||||||
|
|
||||||
dnl check for gstreamer-interfaces; uinstalled is selected preferentially
|
dnl check for gstreamer-interfaces; uinstalled is selected preferentially
|
||||||
PKG_CHECK_MODULES(GST_PLUGINS_LIBS, gstreamer-libs-$GST_MAJORMINOR >= $GST_REQ,
|
PKG_CHECK_MODULES(GST_PLUGINS_BASE,
|
||||||
HAVE_GST_PLUGINS="yes", HAVE_GST_PLUGINS="no")
|
gstreamer-plugins-base-$GST_MAJORMINOR >= $GST_REQ,
|
||||||
|
HAVE_GST_PLUGINS_BASE="yes", HAVE_GST_PLUGINS_BASE="no")
|
||||||
|
|
||||||
if test "x$HAVE_GST_PLUGINS" = "xno"; then
|
if test "x$HAVE_GST_PLUGINS_BASE" = "xno"; then
|
||||||
AC_MSG_ERROR(no GStreamer Plugins Libs found)
|
AC_MSG_ERROR(no GStreamer Base Plugins development files found)
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AC_SUBST(GST_PLUGINS_LIBS_LIBS)
|
AC_SUBST(GST_PLUGINS_BASE_LIBS)
|
||||||
AC_SUBST(GST_PLUGINS_LIBS_CFLAGS)
|
AC_SUBST(GST_PLUGINS_BASE_CFLAGS)
|
||||||
|
|
||||||
dnl Determine endianness
|
dnl Determine endianness
|
||||||
AC_C_BIGENDIAN
|
AC_C_BIGENDIAN
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
plugin_LTLIBRARIES = libgstalpha.la
|
plugin_LTLIBRARIES = libgstalpha.la
|
||||||
|
|
||||||
libgstalpha_la_SOURCES = gstalpha.c
|
libgstalpha_la_SOURCES = gstalpha.c
|
||||||
libgstalpha_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_LIBS_CFLAGS)
|
libgstalpha_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS)
|
||||||
libgstalpha_la_LIBADD =
|
libgstalpha_la_LIBADD =
|
||||||
libgstalpha_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
|
libgstalpha_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
|
||||||
|
|
||||||
|
|
|
@ -9,10 +9,12 @@ noinst_HEADERS = \
|
||||||
gstavimux.h \
|
gstavimux.h \
|
||||||
gstavidemux.h
|
gstavidemux.h
|
||||||
|
|
||||||
libgstavi_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_LIBS) \
|
libgstavi_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) \
|
||||||
|
-I$(top_srcdir)/gst-libs \
|
||||||
-DGETTEXT_PACKAGE="\"gst-plugins\""
|
-DGETTEXT_PACKAGE="\"gst-plugins\""
|
||||||
libgstavi_la_LIBADD =
|
libgstavi_la_LIBADD =
|
||||||
libgstavi_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) \
|
libgstavi_la_LDFLAGS = \
|
||||||
../../../gst-plugins-base/gst-libs/gst/riff/libgstriff-0.9.la
|
$(GST_PLUGIN_LDFLAGS) \
|
||||||
|
$(GST_PLUGINS_BASE_LIBS)
|
||||||
|
|
||||||
EXTRA_DIST = README gstavimux.c
|
EXTRA_DIST = README gstavimux.c
|
||||||
|
|
Loading…
Reference in a new issue