From a75ebe24c8b2fa205b8f5864b495fe40e6f8bc9c Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Wed, 11 Jan 2006 11:44:02 +0000 Subject: [PATCH] prerelease Original commit message from CVS: prerelease --- ChangeLog | 7 ++++++- configure.ac | 9 ++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index a2dffaa70a..423a6dac2c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-01-11 Thomas Vander Stichele + + * configure.ac: + prerelease + 2006-01-10 Tim-Philipp Müller * ext/amrnb/amrnbparse.c: (gst_amrnbparse_query): @@ -214,7 +219,7 @@ 2005-12-16 Stefan Kost * gst/asfdemux/gstasfmux.c: (gst_asfmux_file_start): - change some char* into char[] + change some char* into char[] 2005-12-15 Edward Hervey diff --git a/configure.ac b/configure.ac index 90a04de4d9..1be3fad192 100644 --- a/configure.ac +++ b/configure.ac @@ -12,7 +12,7 @@ AM_MAINTAINER_MODE dnl when going to/from release please set the nano (fourth number) right ! dnl releases only do Wall, cvs and prerelease does Werror too -AS_VERSION(gst-plugins-ugly, GST_PLUGINS_UGLY_VERSION, 0, 10, 0, 1, +AS_VERSION(gst-plugins-ugly, GST_PLUGINS_UGLY_VERSION, 0, 10, 0, 2, GST_CVS="no", GST_CVS="yes") AM_INIT_AUTOMAKE($PACKAGE,$VERSION) @@ -26,6 +26,10 @@ AC_SUBST(GST_MAJORMINOR) AS_LIBTOOL_TAGS([CXX]) AM_PROG_LIBTOOL +dnl *** required versions of GStreamer stuff *** +GST_REQ=0.10.1 +GSTPB_REQ=0.10.1 + AC_CONFIG_SRCDIR([ext/mad/gstmad.c]) AM_CONFIG_HEADER(config.h) @@ -134,7 +138,6 @@ GST_ARCH() dnl check for gstreamer dnl uninstalled is selected preferentially -- see pkg-config(1) -GST_REQ=0.9.7 PKG_CHECK_MODULES(GST, gstreamer-$GST_MAJORMINOR >= $GST_REQ, HAVE_GST="yes", HAVE_GST="no") @@ -161,7 +164,7 @@ AC_SUBST(GST_BASE_CFLAGS) dnl check for gstreamer-plugins-base; uinstalled is selected preferentially PKG_CHECK_MODULES(GST_PLUGINS_BASE, - gstreamer-plugins-base-$GST_MAJORMINOR >= $GST_REQ, + gstreamer-plugins-base-$GST_MAJORMINOR >= $GSTPB_REQ, HAVE_GST_PLUGINS_BASE="yes", HAVE_GST_PLUGINS_BASE="no") if test "x$HAVE_GST_PLUGINS_BASE" = "xno"; then