diff options
| author | Thomas Vander Stichele <thomas@apestaart.org> | 2005-06-30 13:19:39 +0000 |
|---|---|---|
| committer | Thomas Vander Stichele <thomas@apestaart.org> | 2005-06-30 13:19:39 +0000 |
| commit | 94e9812b6bfcf12b9a2d12a737f492f5d05bfe0f (patch) | |
| tree | 72536d69046b6ff30876ac8710abf84edf127260 | |
| parent | b87df5e4608914966e87f56c79caa9d3ab42eb78 (diff) | |
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
| m--------- | common | 0 | ||||
| -rw-r--r-- | configure.ac | 13 | ||||
| -rw-r--r-- | gst/alpha/Makefile.am | 2 | ||||
| -rw-r--r-- | gst/avi/Makefile.am | 8 |
4 files changed, 13 insertions, 10 deletions
diff --git a/common b/common -Subproject 2826306411790bf8aa9298922aa59b126897431 +Subproject 4ca96aedcf2be0b3dcf31fce732aed1da21b885 diff --git a/configure.ac b/configure.ac index a6aab22d..60650820 100644 --- a/configure.ac +++ b/configure.ac @@ -256,15 +256,16 @@ AC_SUBST(GST_INTERFACES_LIBS) AC_SUBST(GST_INTERFACES_CFLAGS) dnl check for gstreamer-interfaces; uinstalled is selected preferentially -PKG_CHECK_MODULES(GST_PLUGINS_LIBS, gstreamer-libs-$GST_MAJORMINOR >= $GST_REQ, - HAVE_GST_PLUGINS="yes", HAVE_GST_PLUGINS="no") +PKG_CHECK_MODULES(GST_PLUGINS_BASE, + 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 - AC_MSG_ERROR(no GStreamer Plugins Libs found) +if test "x$HAVE_GST_PLUGINS_BASE" = "xno"; then + AC_MSG_ERROR(no GStreamer Base Plugins development files found) fi -AC_SUBST(GST_PLUGINS_LIBS_LIBS) -AC_SUBST(GST_PLUGINS_LIBS_CFLAGS) +AC_SUBST(GST_PLUGINS_BASE_LIBS) +AC_SUBST(GST_PLUGINS_BASE_CFLAGS) dnl Determine endianness AC_C_BIGENDIAN diff --git a/gst/alpha/Makefile.am b/gst/alpha/Makefile.am index 9f8e835b..61f56e71 100644 --- a/gst/alpha/Makefile.am +++ b/gst/alpha/Makefile.am @@ -2,7 +2,7 @@ plugin_LTLIBRARIES = libgstalpha.la 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_LDFLAGS = $(GST_PLUGIN_LDFLAGS) diff --git a/gst/avi/Makefile.am b/gst/avi/Makefile.am index 8db68a31..f07af2ac 100644 --- a/gst/avi/Makefile.am +++ b/gst/avi/Makefile.am @@ -9,10 +9,12 @@ noinst_HEADERS = \ gstavimux.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\"" libgstavi_la_LIBADD = -libgstavi_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) \ - ../../../gst-plugins-base/gst-libs/gst/riff/libgstriff-0.9.la +libgstavi_la_LDFLAGS = \ + $(GST_PLUGIN_LDFLAGS) \ + $(GST_PLUGINS_BASE_LIBS) EXTRA_DIST = README gstavimux.c |