diff options
| author | Tim-Philipp Müller <tim@centricular.net> | 2013-09-19 17:17:24 +0100 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.net> | 2013-09-19 17:21:47 +0100 |
| commit | 74a6857d26a22d1419c89b00ba5acbc8e2a2c68a (patch) | |
| tree | 448152cfa0ed02f821820025f28e964a6cf80c47 /m4 | |
| parent | 49f8c40577806b3de95c3265e5362a5f2b085b2f (diff) | |
| download | gstreamer-common-74a6857d26a22d1419c89b00ba5acbc8e2a2c68a.tar.gz | |
gst-glib2.m4: disable cast checks and assertions for pre-releases as well
We want pre-releases to match the final release as much as possible,
so should use the same flags.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/gst-glib2.m4 | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/m4/gst-glib2.m4 b/m4/gst-glib2.m4 index 9a3a923..0b92734 100644 --- a/m4/gst-glib2.m4 +++ b/m4/gst-glib2.m4 @@ -27,8 +27,8 @@ AC_DEFUN([AG_GST_GLIB_CHECK], dnl when using threading primitives) GLIB_EXTRA_CFLAGS="$GLIB_EXTRA_CFLAGS -DG_THREADS_MANDATORY" - dnl Define G_DISABLE_DEPRECATED for GIT versions - if test "x$PACKAGE_VERSION_NANO" = "x1" -o "x`expr $PACKAGE_VERSION_MINOR % 2`" = "x1"; then + dnl Define G_DISABLE_DEPRECATED for development versions + if test "x`expr $PACKAGE_VERSION_MINOR % 2`" = "x1" -a "x`expr $PACKAGE_VERSION_MICRO '<' 90`" = "x1"; then GLIB_EXTRA_CFLAGS="$GLIB_EXTRA_CFLAGS -DG_DISABLE_DEPRECATED" fi @@ -38,8 +38,8 @@ AC_DEFUN([AG_GST_GLIB_CHECK], [enable_gobject_cast_checks=auto]) if test "x$enable_gobject_cast_checks" = "xauto"; then - dnl For releases, turn off the cast checks - if test "x$PACKAGE_VERSION_NANO" = "x1" -o "x`expr $PACKAGE_VERSION_MINOR % 2`" = "x1"; then + dnl Turn on cast checks only for development versions + if test "x`expr $PACKAGE_VERSION_MINOR % 2`" = "x1" -a "x`expr $PACKAGE_VERSION_MICRO '<' 90`" = "x1"; then enable_gobject_cast_checks=yes else enable_gobject_cast_checks=no @@ -56,8 +56,8 @@ AC_DEFUN([AG_GST_GLIB_CHECK], [enable_glib_assertions=auto]) if test "x$enable_glib_assertions" = "xauto"; then - dnl For releases, turn off the assertions - if test "x$PACKAGE_VERSION_NANO" = "x1" -o "x`expr $PACKAGE_VERSION_MINOR % 2`" = "x1"; then + dnl Enable assertions only for development versions + if test "x`expr $PACKAGE_VERSION_MINOR % 2`" = "x1" -a "x`expr $PACKAGE_VERSION_MICRO '<' 90`" = "x1"; then enable_glib_assertions=yes else enable_glib_assertions=no |