summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Schmidt <thaytan@mad.scientist.com>2005-07-01 09:25:58 +0000
committerJan Schmidt <thaytan@mad.scientist.com>2005-07-01 09:25:58 +0000
commitc3c686f779d6bde9e493255a46462754da42d29c (patch)
tree4d5b4637d0b31921651d531f4eb7263fafebe8b3
parent092e032526456b36a9795a8877177d2ad0a8a325 (diff)
downloadgst-plugins-bad-c3c686f779d6bde9e493255a46462754da42d29c.tar.gz
gst-plugins-bad-c3c686f779d6bde9e493255a46462754da42d29c.tar.bz2
gst-plugins-bad-c3c686f779d6bde9e493255a46462754da42d29c.zip
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
-rw-r--r--ChangeLog7
-rw-r--r--configure.ac13
2 files changed, 8 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog
index 7ea24a4e..9b8bfcd7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,11 @@
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:
* gst/effectv/Makefile.am:
diff --git a/configure.ac b/configure.ac
index 60650820..c58f654a 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")