summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac5
-rw-r--r--tools/check-coding-style.mk2
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;\