From 7ac816f38e25ca48cb0c049a82e8d43d0291a47f Mon Sep 17 00:00:00 2001
From: Guillaume Sadegh <sadegh@lrde.epita.fr>
Date: Fri, 12 Jun 2009 16:14:05 +0200
Subject: [PATCH] Adjust the build system for ICC.

    * m4/intel.m4: Remove the `-W' option from CXXFLAGS since icpc
    does not support it. Inhibit the warning ``method was declared
    but never referenced''.
---
 ChangeLog   |  8 ++++++++
 m4/intel.m4 | 10 +++++++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3b7862882..b8df99420 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2009-06-12  Guillaume Sadegh  <sadegh@lrde.epita.fr>
+
+	Adjust the build system for ICC.
+
+	* m4/intel.m4: Remove the `-W' option from CXXFLAGS since icpc
+	does not support it. Inhibit the warning ``method was declared
+	but never referenced''.
+
 2009-06-11  Alexandre Duret-Lutz  <adl@lrde.epita.fr>
 
 	Kill a g++-4.2 warning.
diff --git a/m4/intel.m4 b/m4/intel.m4
index a6e736d37..a07f4e70d 100644
--- a/m4/intel.m4
+++ b/m4/intel.m4
@@ -14,10 +14,11 @@ _AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [[#ifndef __INTEL_COMPILER
 ac_cv_[]_AC_LANG_ABBREV[]_compiler_intel=$ac_compiler_intel
 ])])# _AC_LANG_COMPILER_INTEL
 
-dnl The list of warnings which must be disabled for Spot.
+dnl The list of warnings that must be disabled for Spot.
 m4_define([_INTEL_IGNORE_WARNINGS],
 [ 69   dnl Warn when an enum value is used as an int, without any
        dnl explicit cast.
+  177  dnl Warm when a method was declared but never referenced.
   279  dnl Warn when a constant expression is used in a control statement.
   654  dnl Warn when a child does not overload all virtual members of his
        dnl parents.
@@ -32,13 +33,16 @@ AC_CACHE_CHECK([to add extra CXXFLAGS for the INTEL C++ compiler],
 		[ac_cv_intel_cxxflags],
 [ dnl
   if test x"$ac_compiler_intel" = x"yes"; then
+    # -W does not exist for icpc in CXXFLAGS.
+    CXXFLAGS=`echo "$CXXFLAGS" | sed 's/-W[[[:space:]]]//g;s/-W$//'`
+
     disabled_warnings=''
     for warning in _INTEL_IGNORE_WARNINGS; do
       disabled_warnings="$disabled_warnings,$warning"
     done
 
-    # remove the extra "," and extra whitespaces.
-    disabled_warnings=`echo "$disabled_warnings" | sed "s/^,//;s/[[:space:]]//g"`
+    # Remove the extra "," and extra whitespaces.
+    disabled_warnings=`echo "$disabled_warnings" | sed "s/^,//;s/[[[:space:]]]//g"`
 
     INTEL_CXXFLAGS="-w1 -Werror -wd${disabled_warnings}"