Adjust GCC --enable-warnings:

  Do not enable -pedantic when cross-compiling with a gcc older
  than 3.0, to avoid warnings from third party system headers.

diff --git a/ares/m4/cares-compilers.m4 b/ares/m4/cares-compilers.m4
index 7a1cbd79db4a7f7ddf006c69f989cfda0c77b3d4..09fdac8791a025cc4b2e8c4f9f9f79b132d4626f 100644 (file)
--- a/ares/m4/cares-compilers.m4
+++ b/ares/m4/cares-compilers.m4
@@ -742,8 +742,14 @@ AC_DEFUN([CARES_SET_COMPILER_WARNING_OPTS], [
       GNUC)
         #
         if test "$want_warnings" = "yes"; then
+          dnl Do not enable -pedantic when cross-compiling with a gcc older
+          dnl than 3.0, to avoid warnings from third party system headers.
+          if test "x$cross_compiling" != "xyes" ||
+            test "$compiler_num" -ge "300"; then
+            tmp_CFLAGS="$tmp_CFLAGS -pedantic"
+          fi
           dnl Set of options we believe *ALL* gcc versions support:
-          tmp_CFLAGS="$tmp_CFLAGS -pedantic -Wall -W -Winline -Wnested-externs"
+          tmp_CFLAGS="$tmp_CFLAGS -Wall -W -Winline -Wnested-externs"
           tmp_CFLAGS="$tmp_CFLAGS -Wmissing-prototypes -Wpointer-arith"
           tmp_CFLAGS="$tmp_CFLAGS -Wwrite-strings"
           dnl -Wcast-align is a bit too annoying on all gcc versions ;-)
@@ -779,6 +785,12 @@ AC_DEFUN([CARES_SET_COMPILER_WARNING_OPTS], [
             tmp_CFLAGS="$tmp_CFLAGS -Wdeclaration-after-statement"
           fi
         fi
+        #
+        dnl Do not issue warnings for code in system include paths.
+        if test "$compiler_num" -ge "300"; then
+          dnl gcc 3.0 and later
+          tmp_CFLAGS="$tmp_CFLAGS -Wno-system-headers"
+        fi
         ;;
         #
       HPUXC)

diff --git a/m4/curl-compilers.m4 b/m4/curl-compilers.m4
index dac93b985cfabc288ed43c164902eed2b0338dbf..d25cba65a789cf4a03c81f8ead3e0096f78ac559 100644 (file)
--- a/m4/curl-compilers.m4
+++ b/m4/curl-compilers.m4
@@ -748,8 +748,14 @@ AC_DEFUN([CURL_SET_COMPILER_WARNING_OPTS], [
       GNUC)
         #
         if test "$want_warnings" = "yes"; then
+          dnl Do not enable -pedantic when cross-compiling with a gcc older
+          dnl than 3.0, to avoid warnings from third party system headers.
+          if test "x$cross_compiling" != "xyes" ||
+            test "$compiler_num" -ge "300"; then
+            tmp_CFLAGS="$tmp_CFLAGS -pedantic"
+          fi
           dnl Set of options we believe *ALL* gcc versions support:
-          tmp_CFLAGS="$tmp_CFLAGS -pedantic -Wall -W -Winline -Wnested-externs"
+          tmp_CFLAGS="$tmp_CFLAGS -Wall -W -Winline -Wnested-externs"
           tmp_CFLAGS="$tmp_CFLAGS -Wmissing-prototypes -Wpointer-arith"
           tmp_CFLAGS="$tmp_CFLAGS -Wwrite-strings"
           dnl -Wcast-align is a bit too annoying on all gcc versions ;-)
@@ -785,6 +791,12 @@ AC_DEFUN([CURL_SET_COMPILER_WARNING_OPTS], [
             tmp_CFLAGS="$tmp_CFLAGS -Wdeclaration-after-statement"
           fi
         fi
+        #
+        dnl Do not issue warnings for code in system include paths.
+        if test "$compiler_num" -ge "300"; then
+          dnl gcc 3.0 and later
+          tmp_CFLAGS="$tmp_CFLAGS -Wno-system-headers"
+        fi
         ;;
         #
       HPUXC)