diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-03-18 18:43:38 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-03-27 15:59:18 +0000 |
| commit | 1c94485115cf0f71dbfa0d5d44cb66c6b776007d (patch) | |
| tree | 5425460a4d123aa14073bf6a8a35ae90885ca7a2 | |
| parent | 7bbbb3f241c92a9acfe924a9e02a09b86927a4d0 (diff) | |
Sync check-coding-style from telepathy-glib next, and compensate for diff
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | tools/check-coding-style.mk | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index df2984794..b9a1e366b 100644 --- a/configure.ac +++ b/configure.ac @@ -165,6 +165,11 @@ AC_ARG_ENABLE(coding-style-checks, AC_SUBST([ENABLE_CODING_STYLE_CHECKS]) +# check-coding-style.mk, from telepathy-glib, uses a different variable name... +# compensate +enable_fatal_warnings="$ENABLE_CODING_STYLE_CHECKS" +AC_SUBST([enable_fatal_warnings]) + AC_ARG_ENABLE([installed-tests], AC_HELP_STRING([--enable-installed-tests], [make tests installable]), diff --git a/tools/check-coding-style.mk b/tools/check-coding-style.mk index 1c0a60f66..f3f74fa4a 100644 --- a/tools/check-coding-style.mk +++ b/tools/check-coding-style.mk @@ -10,7 +10,7 @@ check-coding-style: sh $(top_srcdir)/tools/check-c-style.sh \ $(addprefix $(srcdir)/,$(check_c_sources)) || fail=1; \ fi;\ - if test yes = "$(ENABLE_CODING_STYLE_CHECKS)"; then \ + if test yes = "$(enable_fatal_warnings)"; then \ exit "$$fail";\ else \ exit 0;\ |