From 70274d9c82410c05d339a2e0ba3006f19e3e96d8 Mon Sep 17 00:00:00 2001 From: Jan Schmidt Date: Fri, 1 Jul 2005 09:25:58 +0000 Subject: [PATCH] Roll gstreamer-interfaces-0.9.pc into gstreamer-plugins-base-0.9.pc Original commit message from CVS: 2005-07-01 Jan Schmidt * configure.ac: * ext/mad/Makefile.am: * sys/oss/Makefile.am: Roll gstreamer-interfaces-0.9.pc into gstreamer-plugins-base-0.9.pc --- ChangeLog | 7 +++++++ configure.ac | 13 +------------ sys/oss/Makefile.am | 2 +- 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7ea24a4..9b8bfcd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,11 @@ 2005-07-01 Jan Schmidt + + * configure.ac: + * ext/mad/Makefile.am: + * sys/oss/Makefile.am: + Roll gstreamer-interfaces-0.9.pc into gstreamer-plugins-base-0.9.pc + +2005-07-01 Jan Schmidt * ext/libcaca/Makefile.am: * ext/mad/Makefile.am: * gst/effectv/Makefile.am: diff --git a/configure.ac b/configure.ac index 6065082..c58f654 100644 --- a/configure.ac +++ b/configure.ac @@ -244,18 +244,7 @@ fi AC_SUBST(GST_BASE_LIBS) AC_SUBST(GST_BASE_CFLAGS) -dnl check for gstreamer-interfaces; uinstalled is selected preferentially -PKG_CHECK_MODULES(GST_INTERFACES, gstreamer-interfaces-$GST_MAJORMINOR >= $GST_REQ, - HAVE_GST_INTERFACES="yes", HAVE_GST_INTERFACES="no") - -if test "x$HAVE_GST_INTERFACES" = "xno"; then - AC_MSG_ERROR(no GStreamer Interfaces Libs found) -fi - -AC_SUBST(GST_INTERFACES_LIBS) -AC_SUBST(GST_INTERFACES_CFLAGS) - -dnl check for gstreamer-interfaces; uinstalled is selected preferentially +dnl check for gstreamer-plugins-base; uinstalled is selected preferentially PKG_CHECK_MODULES(GST_PLUGINS_BASE, gstreamer-plugins-base-$GST_MAJORMINOR >= $GST_REQ, HAVE_GST_PLUGINS_BASE="yes", HAVE_GST_PLUGINS_BASE="no") diff --git a/sys/oss/Makefile.am b/sys/oss/Makefile.am index 69c128e..69e0144 100644 --- a/sys/oss/Makefile.am +++ b/sys/oss/Makefile.am @@ -8,7 +8,7 @@ libgstossaudio_la_SOURCES = gstossaudio.c \ libgstossaudio_la_CFLAGS = $(GST_CFLAGS) libgstossaudio_la_LIBADD = $(top_builddir)/gst-libs/gst/libgstinterfaces-@GST_MAJORMINOR@.la -libgstossaudio_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(GST_INTERFACES_LIBS) +libgstossaudio_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(GST_PLUGINS_BASE_LIBS) noinst_HEADERS = gstosssink.h \ gstosssrc.h \ -- 2.7.4