From b95f11aa0a7887f5eb8eb8e2e0f09532bc3604ba Mon Sep 17 00:00:00 2001
From: Mikko Koppanen <mkoppanen@php.net>
Date: Sat, 16 Oct 2010 01:05:15 +0200
Subject: Don't set pedantic to yes if using ICC

Signed-off-by: Mikko Koppanen <mkoppanen@php.net>
---
 acinclude.m4 | 17 +++++++++++++++++
 configure.in | 13 +++++++++----
 2 files changed, 26 insertions(+), 4 deletions(-)
 create mode 100644 acinclude.m4

diff --git a/acinclude.m4 b/acinclude.m4
new file mode 100644
index 0000000..be5d149
--- /dev/null
+++ b/acinclude.m4
@@ -0,0 +1,17 @@
+dnl ##############################################################################
+dnl # AC_CHECK_LANG_ICC                                                          #
+dnl # Check if the current language is compiled using ICC                        #
+dnl # Adapted from http://software.intel.com/en-us/forums/showthread.php?t=67984 #
+dnl ##############################################################################
+AC_DEFUN([AC_CHECK_LANG_ICC],
+          [AC_CACHE_CHECK([whether we are using Intel _AC_LANG compiler],
+          [ac_cv_[]_AC_LANG_ABBREV[]_intel_compiler],
+          [_AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],
+[[#ifndef __INTEL_COMPILER
+       error if not ICC
+#endif
+]])],
+          [is_icc=yes],
+          [is_icc=no])
+ac_cv_[]_AC_LANG_ABBREV[]_intel_compiler=$is_icc
+])])
diff --git a/configure.in b/configure.in
index 33fdfb4..e52180d 100644
--- a/configure.in
+++ b/configure.in
@@ -53,8 +53,13 @@ LIBZMQ_EXTRA_CXXFLAGS=""
 # Extra LDFLAGS are appended at the end of LDFLAGS for libzmq.
 LIBZMQ_EXTRA_LDFLAGS=""
 
-# By default compiling with -pedantic except QNX and OSX.
-pedantic="yes"
+# Enable -pedantic if not using icc, this may be overridden later
+AC_CHECK_LANG_ICC
+if test "xyes" = "x$ac_cv_c_intel_compiler" -o "xyes" = "x$ac_cv_cpp_intel_compiler"; then
+    pedantic="no"
+else
+    pedantic="yes"
+fi
 
 #By default compiling with -Werror except OSX.
 werror="yes"
@@ -325,11 +330,11 @@ if test "x$gnu_compilers" = "xyes" -a "x$pgm_ext" = "xno"; then
     CPPFLAGS="-Wall $CPPFLAGS"
 
     if test "x$pedantic" = "xyes"; then
-	CPPFLAGS="-pedantic $CPPFLAGS"
+        CPPFLAGS="-pedantic $CPPFLAGS"
     fi
 
     if test "x$werror" = "xyes"; then
-	CPPFLAGS="-Werror $CPPFLAGS"
+        CPPFLAGS="-Werror $CPPFLAGS"
     fi
 fi
 
-- 
cgit v1.2.3