| commit | d5c0351055d5709da8f3e16c91348092fdb481aa | [log] [tgz] |
|---|---|---|
| author | Marcel Raad <Marcel.Raad@teamviewer.com> | Mon Jul 09 18:38:23 2018 +0200 |
| committer | Marcel Raad <Marcel.Raad@teamviewer.com> | Tue Aug 21 18:53:44 2018 +0200 |
| tree | 1e8d54641e57622998b49c3972a6191bc420b42d | |
| parent | a829c4b25e2197d60afacefe3c868a974c3cd125 [diff] |
configure: conditionally enable pedantic-errors Enable pedantic-errors for GCC >= 5 with --enable-werror. Before GCC 5, pedantic-errors was synonymous to -Werror=pedantic [0], which is still the case for clang [1]. With GCC 5, it became complementary [2]. Also fix a resulting error in acinclude.m4 as main's return type was missing, which is illegal in C99. [0] https://gcc.gnu.org/onlinedocs/gcc-4.9.0/gcc/Warning-Options.html [1] https://clang.llvm.org/docs/UsersManual.html#options-to-control-error-and-warning-messages [2] https://gcc.gnu.org/onlinedocs/gcc-5.1.0/gcc/Warning-Options.html Closes https://github.com/curl/curl/pull/2747
diff --git a/acinclude.m4 b/acinclude.m4 index f32e86c..355ee3a 100644 --- a/acinclude.m4 +++ b/acinclude.m4
@@ -2158,7 +2158,7 @@ dnl point also is available run-time! AC_MSG_CHECKING([run-time libs availability]) CURL_RUN_IFELSE([ -main() +int main() { return 0; }
diff --git a/configure.ac b/configure.ac index 18b7ae0..ff8f5df 100755 --- a/configure.ac +++ b/configure.ac
@@ -61,6 +61,13 @@ CURL_CFLAG_EXTRAS="" if test X"$want_werror" = Xyes; then CURL_CFLAG_EXTRAS="-Werror" + if test "$compiler_id" = "GNU_C"; then + dnl enable -pedantic-errors for GCC 5 and later, + dnl as before that it was the same as -Werror=pedantic + if test "$compiler_num" -ge "500"; then + CURL_CFLAG_EXTRAS="$CURL_CFLAG_EXTRAS -pedantic-errors" + fi + fi fi AC_SUBST(CURL_CFLAG_EXTRAS)