configure.ac: Change rtpmanager disabling to keep -bad releasable.

Original commit message from CVS:
* configure.ac:
Change rtpmanager disabling to keep -bad releasable.

diff --git a/ChangeLog b/ChangeLog
index b0b23ad..56bcb6b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-04-19  David Schleef  <ds@schleef.org>
+
+       * configure.ac:
+         Change rtpmanager disabling to keep -bad releasable.
+
 2007-04-18  David Schleef  <ds@schleef.org>
 
        * configure.ac:

diff --git a/common b/common
index e05f45f..765d03a 160000 (submodule)
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit e05f45f13961b851501ca8938aa2049fa96c7b11
+Subproject commit 765d03a88492fb4ac81d70457f671f3a109e93de

diff --git a/configure.ac b/configure.ac
index 7d3ffdf..a05db5d 100644 (file)
--- 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.12.1
+GSTPB_REQ=0.10.11.1
 
 dnl *** autotools stuff ****
 
@@ -265,8 +265,11 @@ 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//`
+dnl Disable rtpmanager if -base isn't the latest
+dnl remove this when GSTPB_REQ is updated
+if ! pkg-config --atleast-version=0.10.12.1 gstreamer-plugins-base-0.10 ; then
+  GST_PLUGINS_SELECTED=`echo $GST_PLUGINS_SELECTED | $SED -e s/rtpmanager//`
+fi
 
 AC_SUBST(GST_PLUGINS_SELECTED)