From 3072c5b8a127057aa922b7c51051bbb4a630b091 Mon Sep 17 00:00:00 2001
From: Yang Tse <yangsita@gmail.com>
Date: Tue, 9 Sep 2008 12:19:16 +0000
Subject: [PATCH] icc adjustments

---
 acinclude.m4      |  1 +
 ares/acinclude.m4 |  1 +
 ares/configure.ac | 13 ++++++-------
 configure.ac      | 13 ++++++-------
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index 61f6ef96f..a12784285 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -3231,6 +3231,7 @@ AC_DEFUN([CURL_CC_DEBUG_OPTS],
          dnl   which we know and do on purpose.
 
          WARN="-wd279,269,981,1418,1419"
+         WARN=""
 
          if test "$gccnum" -gt "600"; then
             dnl icc 6.0 and older doesn't have the -Wall flag
diff --git a/ares/acinclude.m4 b/ares/acinclude.m4
index 707ba7ee1..9cb54ae54 100644
--- a/ares/acinclude.m4
+++ b/ares/acinclude.m4
@@ -1892,6 +1892,7 @@ AC_DEFUN([CURL_CC_DEBUG_OPTS],
          dnl   which we know and do on purpose.
 
          WARN="-wd279,269,981,1418,1419"
+         WARN=""
 
          if test "$gccnum" -gt "600"; then
             dnl icc 6.0 and older doesn't have the -Wall flag
diff --git a/ares/configure.ac b/ares/configure.ac
index fe8a7a7f0..9c5c426a0 100644
--- a/ares/configure.ac
+++ b/ares/configure.ac
@@ -167,13 +167,6 @@ esac
 AC_MSG_RESULT($need_no_undefined)
 AM_CONDITIONAL(NO_UNDEFINED, test x$need_no_undefined = xyes)
 
-dnl **********************************************************************
-dnl check if this is the Intel ICC compiler, and if so make it stricter
-dnl (convert warning 147 into an error) so that it properly can detect the
-dnl gethostbyname_r() version
-dnl **********************************************************************
-CURL_DETECT_ICC([CFLAGS="$CFLAGS -we 147"])
-
 dnl **********************************************************************
 dnl platform/compiler/architecture specific checks/flags
 dnl **********************************************************************
@@ -239,6 +232,12 @@ if test "$curl_cv_have_def___INTEL_COMPILER" = "yes"; then
   CFLAGS="$CFLAGS -std=c89"
   dnl Disable use of ANSI C aliasing rules in optimizations
   CFLAGS="$CFLAGS -no-ansi-alias"
+  dnl Change some warnings into errors
+  dnl #140: too many arguments in function call
+  dnl #147: declaration is incompatible with 'previous one'
+  dnl #165: too few arguments in function call
+  dnl #266: function declared implicitly
+  CFLAGS="$CFLAGS -we 140,147,165,266"
 else
   AC_MSG_RESULT([no])
 fi
diff --git a/configure.ac b/configure.ac
index 71464f43f..cad4a09d5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -306,6 +306,12 @@ if test "$curl_cv_have_def___INTEL_COMPILER" = "yes"; then
   CFLAGS="$CFLAGS -std=c89"
   dnl Disable use of ANSI C aliasing rules in optimizations
   CFLAGS="$CFLAGS -no-ansi-alias"
+  dnl Change some warnings into errors
+  dnl #140: too many arguments in function call
+  dnl #147: declaration is incompatible with 'previous one'
+  dnl #165: too few arguments in function call
+  dnl #266: function declared implicitly
+  CFLAGS="$CFLAGS -we 140,147,165,266"
 else
   AC_MSG_RESULT([no])
 fi
@@ -541,13 +547,6 @@ AC_HELP_STRING([--disable-manual],[Disable built-in manual]),
 dnl The actual use of the USE_MANUAL variable is done much later in this
 dnl script to allow other actions to disable it as well.
 
-dnl **********************************************************************
-dnl check if this is the Intel ICC compiler, and if so make it stricter
-dnl (convert warning 147 into an error) so that it properly can detect the
-dnl gethostbyname_r() version
-dnl **********************************************************************
-CURL_DETECT_ICC([CFLAGS="$CFLAGS -we 147"])
-
 dnl **********************************************************************
 dnl Checks for libraries.
 dnl **********************************************************************