summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 4fae157)
raw | patch | inline | side by side (parent: 4fae157)
author | Jan Schmidt <thaytan@mad.scientist.com> | |
Fri, 1 Jul 2005 09:25:58 +0000 (09:25 +0000) | ||
committer | Jan Schmidt <thaytan@mad.scientist.com> | |
Fri, 1 Jul 2005 09:25:58 +0000 (09:25 +0000) |
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
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
ChangeLog | patch | blob | history | |
configure.ac | patch | blob | history | |
ext/mad/Makefile.am | patch | blob | history |
diff --git a/ChangeLog b/ChangeLog
index 7ea24a4e5e459d7e551e9fbb393c264f9dadc514..9b8bfcd7a8fd093081413e1bfbe0d8d1012fe032 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
+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
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/ext/mad/Makefile.am b/ext/mad/Makefile.am
index 0d159f39faf0809aca71a0569dbd2ed11fbf21bb..ce5e9a0ca6a425cb579faecbdb4d7a6edfb47aba 100644 (file)
--- a/ext/mad/Makefile.am
+++ b/ext/mad/Makefile.am
libgstmad_la_SOURCES = gstmad.c gstid3tag.c
libgstmad_la_CFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(MAD_CFLAGS) $(ID3_CFLAGS)
-libgstmad_la_LIBADD = $(MAD_LIBS) $(ID3_LIBS) $(GST_INTERFACES_LIBS)
+libgstmad_la_LIBADD = $(MAD_LIBS) $(ID3_LIBS)
libgstmad_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(GST_PLUGINS_BASE_LIBS) -lgsttagedit-0.9
noinst_HEADERS = gstmad.h