From 053bc1de9e30bd30d2fee30387b1b100b3da8536 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Mon, 6 Feb 2017 19:17:49 +0100
Subject: [PATCH] build: reorder flags in "m4/compiler_options.m4"

Mostly sort alphabetically, but
  - keep -Wextra first
  - move "-Wno-*" flags to the end

(cherry picked from commit 4a72c121edeaf3bb317bb30fae926045add64915)
---
 m4/compiler_options.m4 | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/m4/compiler_options.m4 b/m4/compiler_options.m4
index 05272b3254..c998711d72 100644
--- a/m4/compiler_options.m4
+++ b/m4/compiler_options.m4
@@ -63,28 +63,28 @@ if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
 
 	for option in \
 		      -Wextra \
-		      -Wno-missing-field-initializers \
-		      -Wimplicit-fallthrough \
-		      -Wshadow \
-		      -Wmissing-declarations \
-		      -Wmissing-prototypes \
 		      -Wdeclaration-after-statement \
-		      -Wformat-security \
 		      -Wfloat-equal \
-		      -Wno-unused-parameter \
-		      -Wno-sign-compare \
-		      -Wno-duplicate-decl-specifier \
-		      -Wstrict-prototypes \
-		      -Wno-unused-but-set-variable \
-		      -Wno-format-y2k \
-		      -Wundef \
-		      -Wimplicit-function-declaration \
-		      -Wpointer-arith \
-		      -Winit-self \
 		      -Wformat-nonliteral \
+		      -Wformat-security \
+		      -Wimplicit-fallthrough \
+		      -Wimplicit-function-declaration \
+		      -Winit-self \
+		      -Wmissing-declarations \
 		      -Wmissing-include-dirs \
-		      -Wno-pragmas \
+		      -Wmissing-prototypes \
+		      -Wpointer-arith \
+		      -Wshadow \
+		      -Wstrict-prototypes \
+		      -Wundef \
+		      -Wno-duplicate-decl-specifier \
 		      -Wno-format-truncation \
+		      -Wno-format-y2k \
+		      -Wno-missing-field-initializers \
+		      -Wno-pragmas \
+		      -Wno-sign-compare \
+		      -Wno-unused-but-set-variable \
+		      -Wno-unused-parameter \
 		      ; do
 		dnl GCC 4.4 does not warn when checking for -Wno-* flags (https://gcc.gnu.org/wiki/FAQ#wnowarning)
                 _NM_COMPILER_FLAG([$(printf '%s' "$option" | sed 's/^-Wno-/-W/')], [],