From 7b3f86152a8bab28a287b3e00d401373ed0f19bc Mon Sep 17 00:00:00 2001
From: Yang Tse <yangsita@gmail.com>
Date: Wed, 10 Sep 2008 17:35:22 +0000
Subject: [PATCH] icc adjustments

---
 ares/configure.ac | 10 +++++-----
 configure.ac      | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/ares/configure.ac b/ares/configure.ac
index 9c5c426a0..745a39cb9 100644
--- a/ares/configure.ac
+++ b/ares/configure.ac
@@ -227,17 +227,17 @@ CURL_CHECK_DEF([__INTEL_COMPILER], [], [silent])
 if test "$curl_cv_have_def___INTEL_COMPILER" = "yes"; then
   AC_MSG_RESULT([yes])
   dnl Select strict ANSI C conformance
-  CFLAGS="$CFLAGS -strict-ansi"
+  CPPFLAGS="$CPPFLAGS -strict-ansi"
   dnl Select ANSI C dialect
-  CFLAGS="$CFLAGS -std=c89"
-  dnl Disable use of ANSI C aliasing rules in optimizations
-  CFLAGS="$CFLAGS -no-ansi-alias"
+  CPPFLAGS="$CPPFLAGS -std=c89 -D__STRICT_ANSI__"
   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"
+  CPPFLAGS="$CPPFLAGS -we 140,147,165,266"
+  dnl Disable use of ANSI C aliasing rules in optimizations
+  CFLAGS="$CFLAGS -no-ansi-alias"
 else
   AC_MSG_RESULT([no])
 fi
diff --git a/configure.ac b/configure.ac
index c396e9508..89ea54afb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -301,17 +301,17 @@ CURL_CHECK_DEF([__INTEL_COMPILER], [], [silent])
 if test "$curl_cv_have_def___INTEL_COMPILER" = "yes"; then
   AC_MSG_RESULT([yes])
   dnl Select strict ANSI C conformance
-  CFLAGS="$CFLAGS -strict-ansi"
+  CPPFLAGS="$CPPFLAGS -strict-ansi"
   dnl Select ANSI C dialect
-  CFLAGS="$CFLAGS -std=c89"
-  dnl Disable use of ANSI C aliasing rules in optimizations
-  CFLAGS="$CFLAGS -no-ansi-alias"
+  CPPFLAGS="$CPPFLAGS -std=c89 -D__STRICT_ANSI__"
   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"
+  CPPFLAGS="$CPPFLAGS -we 140,147,165,266"
+  dnl Disable use of ANSI C aliasing rules in optimizations
+  CFLAGS="$CFLAGS -no-ansi-alias"
 else
   AC_MSG_RESULT([no])
 fi