diff --git a/ares/acinclude.m4 b/ares/acinclude.m4 index 76ff0deef..32a35036c 100644 --- a/ares/acinclude.m4 +++ b/ares/acinclude.m4 @@ -20,27 +20,28 @@ AC_DEFUN([CURL_CC_DEBUG_OPTS], AC_MSG_RESULT($gccver) AC_MSG_CHECKING([if this is icc in disguise]) - AC_EGREP_CPP([^__ICC], [__ICC], + AC_EGREP_CPP([^__INTEL_COMPILER], [__INTEL_COMPILER], dnl action if the text is found, this it has not been replaced by the dnl cpp - [ICC="no"] + ICC="no" AC_MSG_RESULT([no]), dnl the text was not found, it was replaced by the cpp - [ICC="yes"] + ICC="yes" AC_MSG_RESULT([yes]) ) if test "$ICC" = "yes"; then dnl this is icc, not gcc. - dnl Warning 279 warns on static conditions in while expressions, - dnl ignore that. + dnl ICC warnings we ignore: + dnl * 279 warns on static conditions in while expressions + dnl * 269 warns on our "%Od" printf formatters for curl_off_t output: + dnl "invalid format string conversion" - WARN="-wd279" + WARN="-wd279,269" if test "$gccnum" -gt "600"; then - dnl icc 6.0 and older doesn't have the -Wall flag, although it does - dnl have -wd + dnl icc 6.0 and older doesn't have the -Wall flag WARN="-Wall $WARN" fi else dnl $ICC = yes