From 725c26fbcd63f7ef13f13c5eb84933db98273fd6 Mon Sep 17 00:00:00 2001
From: Dustin Sallings <dustin@spy.net>
Date: Fri, 13 Feb 2009 14:22:36 -0800
Subject: [PATCH] Workaround Solaris autoconf interaction to look for C99.

The ICC check seems to abort prematurely, so doing the test from
within the function doesn't work.  Instead, get the vars set, and do
the check based on the var values.
---
 configure.ac | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/configure.ac b/configure.ac
index 7436f7d818..a35d158bb0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,23 +20,20 @@ AC_DEFUN([DETECT_ICC],
     if test "$GCC" = "yes"; then
        dnl check if this is icc acting as gcc in disguise
        AC_EGREP_CPP([^__INTEL_COMPILER], [__INTEL_COMPILER],
-         dnl action if the text is found, this it has not been replaced by the
-         dnl cpp
-         ICC="no"
-         [$2],
-         dnl the text was not found, it was replaced by the cpp
-         ICC="yes"
+         AC_MSG_RESULT([no])
+         [$2]
+         ICC="no",
          AC_MSG_RESULT([yes])
          [$1]
-       )
-    fi
-    if test "$ICC" = "no"; then
-        # this is not ICC
-        AC_MSG_RESULT([no])
+         ICC="yes")
     fi
 ])
 
-DETECT_ICC([], [AC_PROG_CC_C99])
+DETECT_ICC([], [])
+
+if test "$ICC" == "no"; then
+   AC_PROG_CC_C99
+fi
 
 AM_PROG_CC_C_O
 AC_PROG_INSTALL