From 88bb6309f6d759465bee0b73196f3f6068cd7ffe Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Mon, 16 May 2005 00:54:09 +0000 Subject: [PATCH] configure.ac: set some variables right for parrallel installability , so we don't conflict with installed Gstreamer Original commit message from CVS: * configure.ac: set some variables right for parrallel installability , so we don't conflict with installed Gstreamer --- ChangeLog | 8 ++++++++ configure.ac | 6 +++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 67745a0179..a2ff841b00 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2005-05-16 Benjamin Otte + + * configure.ac: + set some variables right for parrallel installability , so we don't + conflict with installed Gstreamer + +=== new branch === + === release 0.8.10 === 2005-05-03 Thomas Vander Stichele diff --git a/configure.ac b/configure.ac index 6c404f1980..1cd401205e 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_CANONICAL_TARGET 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(gstreamer, GST_VERSION, 0, 8, 10, 0, GST_CVS="no", GST_CVS="yes") +AS_VERSION(gstreamer, GST_VERSION, 0, 11, 0, 1, GST_CVS="no", GST_CVS="yes") dnl AM_MAINTAINER_MODE only provides the option to configure to enable it AM_MAINTAINER_MODE @@ -12,7 +12,7 @@ AM_INIT_AUTOMAKE($PACKAGE,$VERSION) dnl our libraries and install dirs use major.minor as a version GST_MAJORMINOR=$GST_VERSION_MAJOR.$GST_VERSION_MINOR dnl we override it here for release candidates -#GST_MAJORMINOR=0.8 +GST_MAJORMINOR=0.12 AC_SUBST(GST_MAJORMINOR) AC_PROG_CC @@ -24,7 +24,7 @@ dnl - library source changed -> increment REVISION dnl - interfaces added/removed/changed -> increment CURRENT, REVISION = 0 dnl - interfaces added -> increment AGE dnl - interfaces removed -> AGE = 0 -AS_LIBTOOL(GST, 5, 0, 4) +AS_LIBTOOL(GST, 0, 0, 0) AM_PROG_LIBTOOL AC_CONFIG_SRCDIR([gst/gst.c])