Merge remote branch 'origin/maint-0.2.1'

1 files changed, 10 insertions, 1 deletions

diff --git a/configure.in b/configure.in
index 917be20ed8..cb07b2f7b0 100644
--- a/configure.in
+++ b/configure.in
@@ -869,6 +869,15 @@ if test x$enable_gcc_warnings = xyes || test x$enable_gcc_warnings_advisory = xy
                     have_shorten64_flag=no)
   CFLAGS="$save_CFLAGS"
 
+  case $host in
+    *-*-openbsd*)
+      # Some OpenBSD versions (like 4.8) have -Wsystem-headers by default.
+      # That's fine, except that the headers don't pass -Wredundant-decls.
+      # Therefore, let's disable -Wsystem-headers when we're building
+      # with maximal warnings on OpenBSD.
+      CFLAGS="$CFLAGS -Wno-system-headers" ;;
+  esac
+
   CFLAGS="$CFLAGS -W -Wfloat-equal -Wundef -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wwrite-strings -Wredundant-decls -Wchar-subscripts -Wcomment -Wformat=2 -Wwrite-strings -Wmissing-declarations -Wredundant-decls -Wnested-externs -Wbad-function-cast -Wswitch-enum"
   if test x$enable_gcc_warnings = xyes; then
     CFLAGS="$CFLAGS -Werror"
@@ -876,7 +885,7 @@ if test x$enable_gcc_warnings = xyes || test x$enable_gcc_warnings_advisory = xy
 
   # Disabled, so we can use mallinfo(): -Waggregate-return
 
-  if test x$have_gcc4 = xyes ; then 
+  if test x$have_gcc4 = xyes ; then
     # These warnings break gcc 3.3.5 and work on gcc 4.0.2
     CFLAGS="$CFLAGS -Winit-self -Wmissing-field-initializers -Wdeclaration-after-statement -Wold-style-definition"
   fi