diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-06-20 11:25:49 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-11-19 15:34:22 +0000 |
| commit | 61081c7ed819a844e26837688347182721922d57 (patch) | |
| tree | db9d38f906f3c36d0d9771cf51bb49436435357e | |
| parent | 8459facc2c5d7f36849b93e40df81a415f5c40b8 (diff) | |
| download | dbus-glib-61081c7ed819a844e26837688347182721922d57.tar.gz | |
Move AC_ARG_ENABLE for checks/assertions closer to where it takes effect
The command line is parsed early on anyway.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=40711
Reviewed-by: Dan Williams <dcbw@redhat.com>
| -rw-r--r-- | configure.ac | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index ef28684..eb68dbd 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 |