From 9dff2ee0e6da22e1a65423c98d5ec88fd664379c Mon Sep 17 00:00:00 2001
From: Jan Schmidt <thaytan@mad.scientist.com>
Date: Fri, 8 Feb 2008 00:57:21 +0000
Subject: [PATCH] configure.ac: Make DISABLE_DEPRECATED defined *only* during
 CVS, not during pre-releases or releases.

Original commit message from CVS:
* configure.ac:
Make DISABLE_DEPRECATED defined *only* during CVS, not during
pre-releases or releases.
---
 ChangeLog    | 6 ++++++
 configure.ac | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 2d159428bb..8f695e0423 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-02-08  Jan Schmidt  <jan.schmidt@sun.com>
+
+	* configure.ac:
+	Make DISABLE_DEPRECATED defined *only* during CVS, not during
+	pre-releases or releases.
+
 2008-02-08  Jan Schmidt  <jan.schmidt@sun.com>
 
 	* configure.ac:
diff --git a/configure.ac b/configure.ac
index 79dc5c5e2c..c12068d05e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -604,7 +604,8 @@ if test "x$USE_DEBUG" = xyes; then
 fi
 AC_SUBST(PROFILE_CFLAGS)
 
-if test "x$GST_CVS" = "xyes"; then
+if test "x$PACKAGE_VERSION_NANO" = "x1"; then
+  dnl Define _only_ during CVS (not pre-releases or releases)
   DEPRECATED_CFLAGS="-DGST_DISABLE_DEPRECATED"
 else
   DEPRECATED_CFLAGS=""