[next] telepathy-gabble: Sync check-coding-style from telepathy-glib next, and compensate for diff

[Simon McVittie]

Module: telepathy-gabble
Branch: next
Commit: 1c94485115cf0f71dbfa0d5d44cb66c6b776007d
URL:    http://cgit.freedesktop.org/telepathy/telepathy-gabble/commit/?id=1c94485115cf0f71dbfa0d5d44cb66c6b776007d

Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date:   Tue Mar 18 18:43:38 2014 +0000

Sync check-coding-style from telepathy-glib next, and compensate for diff

---

 configure.ac                |    5 +++++
 tools/check-coding-style.mk |    2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index df29847..b9a1e36 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 1c0a60f..f3f74fa 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;\