Attachment 51139 Details for Bug 40711 – [06/14] Move AC_ARG_ENABLE for checks/assertions closer to where it takes effect

[patch] [06/14] Move AC_ARG_ENABLE for checks/assertions closer to where it takes effect

0006-Move-AC_ARG_ENABLE-for-checks-assertions-closer-to-w.patch (text/plain), 2.34 KB, created by Simon McVittie on 2011-09-13 08:49:21 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Simon McVittie

Created: 2011-09-13 08:49:21 UTC

Size: 2.34 KB

patch

obsolete

>From 0196483843c1111c00d139308d8c11bb7c481794 Mon Sep 17 00:00:00 2001
>From: Simon McVittie <simon.mcvittie@collabora.co.uk>
>Date: Mon, 20 Jun 2011 11:25:49 +0100
>Subject: [PATCH 06/14] Move AC_ARG_ENABLE for checks/assertions closer to
> where it takes effect
>
>The command line is parsed early on anyway.
>---
> configure.ac |   13 +++++++++----
> 1 files changed, 9 insertions(+), 4 deletions(-)
>
>diff --git a/configure.ac b/configure.ac
>index b422296..c3e3f2f 100644
>--- a/configure.ac
>+++ b/configure.ac
>@@ -47,8 +47,6 @@ AC_HEADER_STDC
> 
> AC_ARG_ENABLE(tests, AS_HELP_STRING([--enable-tests],[enable unit test code]),enable_tests=$enableval,enable_tests=$USE_MAINTAINER_MODE)
> AC_ARG_ENABLE(ansi, AS_HELP_STRING([--enable-ansi],[enable -ansi -pedantic gcc flags]),enable_ansi=$enableval,enable_ansi=no)
>-AC_ARG_ENABLE(asserts, AS_HELP_STRING([--enable-asserts],[include assertion checks]),enable_asserts=$enableval,enable_asserts=$USE_MAINTAINER_MODE)
>-AC_ARG_ENABLE(checks, AS_HELP_STRING([--enable-checks],[include sanity checks on public API]),enable_checks=$enableval,enable_checks=yes)
> AC_ARG_ENABLE(gcov, AS_HELP_STRING([--enable-gcov],[compile with coverage profiling instrumentation (gcc only)]),enable_gcov=$enableval,enable_gcov=no)
> AC_ARG_ENABLE(bash-completion, AS_HELP_STRING([--enable-bash-completion],[install bash completion scripts]),enable_bash_completion=$enableval,enable_bash_completion=yes)
> AC_ARG_WITH(test-socket-dir, AS_HELP_STRING([--with-test-socket-dir=[dirname]],[Where to put sockets for make check]))
>@@ -75,11 +73,18 @@ if test x$enable_tests = xyes; then
>     AC_DEFINE(DBUS_BUILD_TESTS,1,[Build test code])
> fi
> 
>+AC_ARG_ENABLE([asserts],
>+  [AS_HELP_STRING([--enable-asserts], [include assertion checks])],
>+  [enable_asserts=$enableval], [enable_asserts=$USE_MAINTAINER_MODE])
> if test x$enable_asserts = xno; then
>-    AC_DEFINE(G_DISABLE_ASSERT,1,[Disable GLib assertion macros])
>+    AC_DEFINE([G_DISABLE_ASSERT], [1], [Disable GLib assertion macros])
> fi
>+
>+AC_ARG_ENABLE([checks],
>+  [AS_HELP_STRING([--enable-checks], [include sanity checks on public API])],
>+  [enable_checks=$enableval], [enable_checks=yes])
> if test x$enable_checks = xno; then
>-    AC_DEFINE(G_DISABLE_CHECKS,1,[Disable GLib public API sanity checking])
>+    AC_DEFINE([G_DISABLE_CHECKS], [1], [Disable GLib public API sanity checking])
> fi
> 
> #### gcc warning flags
>-- 
>1.7.5.4
>

Actions: View | Splinter Review

Attachments on bug 40711: 51134 | 51135 | 51136 | 51137 | 51138 | 51139 | 51140 | 51141 | 51142 | 51144 | 51145 | 51146 | 51147 | 51148 | 53106 | 53107 | 53108 | 70262 | 70263 | 70264

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.