summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Schmidt <thaytan@mad.scientist.com>2008-02-08 01:12:09 +0000
committerJan Schmidt <thaytan@mad.scientist.com>2008-02-08 01:12:09 +0000
commit440f4cd1810f7150aed8cba41f31a47b5f796629 (patch)
treef5a6f4072d3415e297fd93b6e4ca609b2bb9f669
parentf16c948c4e78aa76cab0fda2bb2b30d37221ecf1 (diff)
downloadgst-plugins-bad-440f4cd1810f7150aed8cba41f31a47b5f796629.tar.gz
gst-plugins-bad-440f4cd1810f7150aed8cba41f31a47b5f796629.tar.bz2
gst-plugins-bad-440f4cd1810f7150aed8cba41f31a47b5f796629.zip
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.
-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=""