commit 34eb161c31fbbcf73de3cdd091a9655486eacb95
Author: Neil Roberts <neil linux intel com>
Date: Fri Oct 14 16:16:19 2011 +0100
configure: Use the release status define to determine default flags
The --enable-debug option had a special m4_define to set the default
value depending on whether the minor version of the release number
suggests this is a git build. This patch changes it to use the
clutter_gst_release_status define instead so that it by default is
enabled only for git builds. The --enable-maintainer-flags option now
uses this too.
The help strings now have some added square brackets otherwise m4
doesn't seem to expand the macro properly.
https://bugzilla.gnome.org/show_bug.cgi?id=661781
configure.ac | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 9a3d426..8c56a41 100644
--- a/configure.ac
+++ b/configure.ac
@@ -192,12 +192,13 @@ AS_IF([test "x$have_cogl_1_8" != xyes],
dnl ========================================================================
-m4_define([maintainer_flags_default], [yes])
+m4_define([maintainer_default], [m4_if(clutter_gst_release_status,
+ [git], [yes], [no])])
AC_ARG_ENABLE([maintainer-flags],
[AC_HELP_STRING([--enable-maintainer-flags=@<:@no/yes@:>@],
- [Use strict compiler flags @<:@default=maintainer_flags_default@:>@])],
+ [Use strict compiler flags @<:@default=]maintainer_default[@:>@])],
[],
- [enable_maintainer_flags=maintainer_flags_default])
+ enable_maintainer_flags=maintainer_default)
AS_IF([test "x$enable_maintainer_flags" = "xyes" && test "x$GCC" = "xyes"],
[
@@ -212,12 +213,13 @@ AC_SUBST(MAINTAINER_CFLAGS)
dnl === Enable debug level ====================================================
-m4_define([debug_default], [m4_if(m4_eval(clutter_gst_minor_version % 2), [1], [yes], [minimum])])
+m4_define([debug_default], [m4_if(clutter_gst_release_status,
+ [git], [yes], [minimum])])
AC_ARG_ENABLE([debug],
[AC_HELP_STRING([--enable-debug=@<:@no/minimum/yes@:>@],
- [Control Clutter-Gst debugging level @<:@default=debug_default@:>@])],
+ [Control Clutter-Gst debugging level @<:@default=]debug_default[@:>@])],
[],
- [enable_debug=debug_default])
+ enable_debug=debug_default)
AS_CASE([$enable_debug],