From a8323cc3f5f3ab0621e14ebf543a870feed2280e Mon Sep 17 00:00:00 2001
From: Yang Tse <yangsita@gmail.com>
Date: Thu, 18 Sep 2008 13:56:56 +0000
Subject: [PATCH] icc adjustments

---
 acinclude.m4      | 8 ++++----
 ares/acinclude.m4 | 8 ++++----
 ares/configure.ac | 6 ++++++
 configure.ac      | 6 ++++++
 4 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/acinclude.m4 b/acinclude.m4
index 90afe8545..fae9b81de 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -2686,10 +2686,10 @@ AC_DEFUN([CURL_CC_DEBUG_OPTS],
          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
-            WARN="-Wall $WARN"
-         fi
+         dnl if test "$gccnum" -gt "600"; then
+         dnl    dnl icc 6.0 and older doesn't have the -Wall flag
+         dnl    WARN="-Wall $WARN"
+         dnl fi
        else dnl $ICC = yes
          dnl this is a set of options we believe *ALL* gcc versions support:
          WARN="-W -Wall -Wwrite-strings -pedantic -Wpointer-arith -Wnested-externs -Winline -Wmissing-prototypes"
diff --git a/ares/acinclude.m4 b/ares/acinclude.m4
index 46b087c2d..9f7729239 100644
--- a/ares/acinclude.m4
+++ b/ares/acinclude.m4
@@ -1894,10 +1894,10 @@ AC_DEFUN([CURL_CC_DEBUG_OPTS],
          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
-            WARN="-Wall $WARN"
-         fi
+         dnl if test "$gccnum" -gt "600"; then
+         dnl    dnl icc 6.0 and older doesn't have the -Wall flag
+         dnl    WARN="-Wall $WARN"
+         dnl fi
        else dnl $ICC = yes
          dnl this is a set of options we believe *ALL* gcc versions support:
          WARN="-W -Wall -Wwrite-strings -pedantic -Wpointer-arith -Wnested-externs -Winline -Wmissing-prototypes"
diff --git a/ares/configure.ac b/ares/configure.ac
index f0e1a04fa..666facd45 100644
--- a/ares/configure.ac
+++ b/ares/configure.ac
@@ -229,6 +229,12 @@ if test "$curl_cv_have_def___INTEL_COMPILER" = "yes"; then
   dnl On Linux this compiler uses gcc's header files, so
   dnl we select ANSI C89 dialect plus GNU extensions.
   CPPFLAGS="$CPPFLAGS -std=gnu89"
+  if test "$curl_cv_def___INTEL_COMPILER" -gt "600"; then
+    dnl Show errors, warnings, and remarks
+    CPPFLAGS="$CPPFLAGS -Wall"
+    dnl Perform extra compile-time code checking
+    CPPFLAGS="$CPPFLAGS -Wcheck"
+  fi
   dnl Change some warnings into errors
   dnl #140: too many arguments in function call
   dnl #147: declaration is incompatible with 'previous one'
diff --git a/configure.ac b/configure.ac
index 5654a4959..c07052a56 100644
--- a/configure.ac
+++ b/configure.ac
@@ -303,6 +303,12 @@ if test "$curl_cv_have_def___INTEL_COMPILER" = "yes"; then
   dnl On Linux this compiler uses gcc's header files, so
   dnl we select ANSI C89 dialect plus GNU extensions.
   CPPFLAGS="$CPPFLAGS -std=gnu89"
+  if test "$curl_cv_def___INTEL_COMPILER" -gt "600"; then
+    dnl Show errors, warnings, and remarks
+    CPPFLAGS="$CPPFLAGS -Wall"
+    dnl Perform extra compile-time code checking
+    CPPFLAGS="$CPPFLAGS -Wcheck"
+  fi
   dnl Change some warnings into errors
   dnl #140: too many arguments in function call
   dnl #147: declaration is incompatible with 'previous one'