summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--configure.ac6
2 files changed, 12 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 5b819c10..b0b23ad9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-04-18 David Schleef <ds@schleef.org>
+
+ * configure.ac:
+ * gst/Makefile.am:
+ Fix wtay's hack. rtpmanager is disabled in configure.ac on
+ line 268.
+
2007-04-18 Wim Taymans <wim@fluendo.com>
* gst/Makefile.am:
diff --git a/configure.ac b/configure.ac
index 97f46b52..7d3ffdfb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -45,7 +45,7 @@ AM_PROG_LIBTOOL
dnl *** required versions of GStreamer stuff ***
GST_REQ=0.10.11.1
-GSTPB_REQ=0.10.11.1
+GSTPB_REQ=0.10.12.1
dnl *** autotools stuff ****
@@ -95,6 +95,7 @@ GST_PLUGINS_ALL="\
nuvdemux \
real \
replaygain \
+ rtpmanager \
spectrum \
speed \
qtdemux \
@@ -264,6 +265,9 @@ if test "x$HAVE_SYS_SOCKET_H" != "xyes"; then
GST_PLUGINS_SELECTED=`echo $GST_PLUGINS_SELECTED | $SED -e s/librfb//`
fi
+# Disable rtpmanager
+GST_PLUGINS_SELECTED=`echo $GST_PLUGINS_SELECTED | $SED -e s/rtpmanager//`
+
AC_SUBST(GST_PLUGINS_SELECTED)