From cc24930aed513c84d80e0dd72bf1ac8a701be032 Mon Sep 17 00:00:00 2001
From: Dan Williams <dcbw@redhat.com>
Date: Fri, 2 Mar 2012 14:06:10 -0600
Subject: build: more flexible build-time warnings and errors options

---
 Makefile.am             |  2 ++
 m4/compiler_warnings.m4 | 11 +++++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 794cc01..9b35207 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,6 +19,8 @@ nmvpnservice_DATA = nm-iodine-service.name
 nm-iodine-service.name: $(srcdir)/nm-iodine-service.name.in
 	sed -e 's|[@]LIBEXECDIR[@]|$(libexecdir)|g' $< >$@
 
+DISTCHECK_CONFIGURE_FLAGS = --enable-more-warnings=yes
+
 EXTRA_DIST = nm-iodine-service.name.in \
              $(dbusservice_DATA)  \
              $(desktop_in_files)  \
diff --git a/m4/compiler_warnings.m4 b/m4/compiler_warnings.m4
index 6cea2f7..12bd26a 100644
--- a/m4/compiler_warnings.m4
+++ b/m4/compiler_warnings.m4
@@ -1,11 +1,11 @@
 AC_DEFUN([NM_COMPILER_WARNINGS],
 [AC_ARG_ENABLE(more-warnings,
-	AS_HELP_STRING([--enable-more-warnings], [Maximum compiler warnings]),
-	set_more_warnings="$enableval",set_more_warnings=yes)
-AC_MSG_CHECKING(for more warnings, including -Werror)
+	AS_HELP_STRING([--enable-more-warnings], [Possible values: no/yes/error]),
+	set_more_warnings="$enableval",set_more_warnings=error)
+AC_MSG_CHECKING(for more warnings)
 if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
 	AC_MSG_RESULT(yes)
-	CFLAGS="-Wall -Werror -std=gnu89 $CFLAGS"
+	CFLAGS="-Wall -std=gnu89 $CFLAGS"
 
 	for option in -Wshadow -Wmissing-declarations -Wmissing-prototypes \
 		      -Wdeclaration-after-statement -Wstrict-prototypes \
@@ -25,6 +25,9 @@ if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
 		unset SAVE_CFLAGS
 	done
 	unset option
+	if test "x$set_more_warnings" = xerror; then
+		CFLAGS="$CFLAGS -Werror"
+	fi
 else
 	AC_MSG_RESULT(no)
 fi
-- 
cgit v1.2.3