Roll gstreamer-interfaces-0.9.pc into gstreamer-plugins-base-0.9.pc

Original commit message from CVS:
2005-07-01  Jan Schmidt  <thaytan@mad.scientist.com>

* configure.ac:
* ext/mad/Makefile.am:
* sys/oss/Makefile.am:
Roll gstreamer-interfaces-0.9.pc into gstreamer-plugins-base-0.9.pc

diff --git a/ChangeLog b/ChangeLog
index 7ea24a4e5e459d7e551e9fbb393c264f9dadc514..9b8bfcd7a8fd093081413e1bfbe0d8d1012fe032 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-07-01  Jan Schmidt  <thaytan@mad.scientist.com>
+
+       * 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  <thaytan@mad.scientist.com>
        * ext/libcaca/Makefile.am:
        * ext/mad/Makefile.am:

diff --git a/configure.ac b/configure.ac
index 60650820f83a0c3b2adc6f1b3ac1c50906a400a6..c58f654a96c9fa356c3997c10db725c037170317 100644 (file)
--- 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 69c128ebf05723bb98bcbd39a9b02042db2e1825..69e0144f335835c51b31d8c84aa889123be2451d 100644 (file)
--- 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     \