From 0742defa9b017ddb156508d060d6d3d6093faeac Mon Sep 17 00:00:00 2001
From: Michael Jerris <mike@jerris.com>
Date: Thu, 28 Apr 2016 13:06:35 -0500
Subject: [PATCH] FS-9109: [build] attempt to fix misleading indentation errors
 on gcc 6.0

---
 configure.ac | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/configure.ac b/configure.ac
index cac1f02b8c..ccc17e53bc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -377,6 +377,16 @@ if test "$ax_cv_c_compiler_vendor" = "gnu"; then
         [ac_cv_gcc_supports_w_no_unused_result=no])])
   CFLAGS="$saved_CFLAGS"
   AC_MSG_RESULT($ac_cv_gcc_supports_w_no_unused_result)
+
+  saved_CFLAGS="$CFLAGS"
+  AC_CACHE_CHECK([whether compiler supports -Wno-misleading-indentation],
+    [ac_cv_gcc_supports_w_no_misleading_indentation], [
+      CFLAGS="$CFLAGS -Wno-misleading-indentation -Wno-error=misleading-indentation"
+      AC_TRY_COMPILE([],[return 0;],
+        [ac_cv_gcc_supports_w_no_misleading_indentation=yes],
+        [ac_cv_gcc_supports_w_no_misleading_indentation=no])])
+  CFLAGS="$saved_CFLAGS"
+  AC_MSG_RESULT($ac_cv_gcc_supports_w_no_misleading_indentation)
 fi
 
 # tweak compiler specific flags
@@ -413,6 +423,9 @@ elif test "x${ax_cv_c_compiler_vendor}" = "xgnu" ; then
       APR_ADDTO(SWITCH_AM_CFLAGS, -Werror)
       APR_ADDTO(SWITCH_AM_CFLAGS, -Wno-unused-result)
     fi
+    if test "$ac_cv_gcc_supports_w_no_misleading_indentation" = yes; then
+      APR_ADDTO(SWITCH_AM_CFLAGS, -Wno-misleading-indentation)
+    fi
     if test "${enable_64}" = "yes"; then
 	case "$host" in
              *darwin*)