From cd018c7a4c40a4d4f2aa3ea24f77282efe213c40 Mon Sep 17 00:00:00 2001
From: Wayne Davison <wayne@opencoder.net>
Date: Tue, 29 Sep 2020 15:17:29 -0700
Subject: Use a better -Wno-pedantic heuristic.

---
 configure.ac | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index 1116e658..3fd7e5d5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1053,9 +1053,10 @@ if test x"$GCC" = x"yes"; then
     else
 	# Our internal popt code cannot be compiled with pedantic warnings as errors, so try to
 	# turn off pedantic warnings (which will not lose the error for array-init overflow).
-	case `$CC -dumpversion 2>/dev/null` in
-	    4.*) ;; # Early gcc doesn't understand -Wno-pedantic
-	    *) CFLAGS="$CFLAGS -pedantic-errors -Wno-pedantic" ;;
+	# Older gcc versions don't understand -Wno-pedantic, so check if --help=warnings lists
+	# -Wpedantic and use that as a flag.
+	case `$CC --help=warnings 2>/dev/null | grep Wpedantic` in
+	    *-Wpedantic*) CFLAGS="$CFLAGS -pedantic-errors -Wno-pedantic" ;;
 	esac
     fi
 fi
-- 
cgit v1.2.1