summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--configure.ac3
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index cd72aeac..1123a577 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
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>
+
* docs/plugins/Makefile.am:
Don't scan deleted xingmux header.
diff --git a/configure.ac b/configure.ac
index d282a1c5..70757550 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1001,7 +1001,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=""