do not include c99 flag in compiler wrappers

This commit was SVN r27625.

ompi/tools/wrappers/mpicc-wrapper-data.txt.in

@@ -11,7 +11,7 @@ version=@OMPI_VERSION@
 language=C
 compiler_env=CC
 compiler_flags_env=CFLAGS
-compiler=@CC@
+compiler=@WRAPPER_CC@
 extra_includes=@OMPI_WRAPPER_EXTRA_INCLUDES@
 preprocessor_flags=@OMPI_WRAPPER_EXTRA_CPPFLAGS@
 compiler_flags_prefix=@OMPI_WRAPPER_EXTRA_CFLAGS_PREFIX@

ompi/tools/wrappers/ompi_wrapper_script.in

@@ -29,7 +29,7 @@ if (exists($ENV{'OPAL_DESTDIR'})
     $libdir = catdir($ddir, $libdir);
 }
 
-my $CC = "@CC@";
+my $CC = "@WRAPPER_CC@";
 my $CXX = "@CXX@";
 my $FC = "@FC@";
 my $extra_includes = "@OMPI_WRAPPER_EXTRA_INCLUDES@";

opal/config/opal_setup_cc.m4

@@ -12,6 +12,8 @@ dnl Copyright (c) 2004-2006 The Regents of the University of California.
 dnl                         All rights reserved.
 dnl Copyright (c) 2007-2009 Sun Microsystems, Inc.  All rights reserved.
 dnl Copyright (c) 2008-2010 Cisco Systems, Inc.  All rights reserved.
+dnl Copyright (c) 2012      Los Alamos National Security, LLC. All rights
+dnl                         reserved.
 dnl $COPYRIGHT$
 dnl 
 dnl Additional copyrights may follow
@@ -32,8 +34,19 @@ AC_DEFUN([OPAL_SETUP_CC],[
     AC_REQUIRE([_OMPI_PROG_CC])
     AC_REQUIRE([AM_PROG_CC_C_O])
 
+    # AC_PROG_CC_C99 changes CC (instead of CFLAGS) so save CC (without c99
+    # flags) for use in our wrappers.
+    WRAPPER_CC="$CC"
+    AC_SUBST([WRAPPER_CC])
+
     # From Open MPI 1.7 on we require a C99 compiant compiler
-    AC_REQUIRE([AC_PROG_CC_C99])
+    AC_PROG_CC_C99
+    # The result of AC_PROG_CC_C99 is stored in ac_cv_prog_cc_c99
+    if test "x$ac_cv_prog_cc_c99" = xno ; then
+        AC_MSG_WARN([Open MPI requires a C99 compiler])
+        AC_MSG_ERROR([Aborting.])
+    fi
+
 
     OMPI_C_COMPILER_VENDOR([ompi_c_vendor])
 

opal/tools/wrappers/opalcc-wrapper-data.txt.in

@@ -11,7 +11,7 @@ version=@OPAL_VERSION@
 language=C
 compiler_env=CC
 compiler_flags_env=CFLAGS
-compiler=@CC@
+compiler=@OPAL_WRAPPER_CC@
 extra_includes=@OPAL_WRAPPER_EXTRA_INCLUDES@
 preprocessor_flags=@OPAL_WRAPPER_EXTRA_CPPFLAGS@
 compiler_flags_prefix=@OPAL_WRAPPER_EXTRA_CFLAGS_PREFIX@

orte/tools/wrappers/orte_wrapper_script.in

@@ -29,7 +29,7 @@ if (exists($ENV{'OPAL_DESTDIR'})
     $libdir = catdir($ddir, $libdir);
 }
 
-my $CC = "@CC@";
+my $CC = "@WRAPPER_CC@";
 my $CXX = "@CXX@";
 my $extra_includes = "@ORTE_WRAPPER_EXTRA_INCLUDES@";
 my $extra_cppflags = "@ORTE_WRAPPER_EXTRA_CPPFLAGS@";

orte/tools/wrappers/ortecc-wrapper-data.txt.in

@@ -11,7 +11,7 @@ version=@ORTE_VERSION@
 language=C
 compiler_env=CC
 compiler_flags_env=CFLAGS
-compiler=@CC@
+compiler=@WRAPPER_CC@
 extra_includes=@ORTE_WRAPPER_EXTRA_INCLUDES@
 preprocessor_flags=@ORTE_WRAPPER_EXTRA_CPPFLAGS@
 compiler_flags_prefix=@ORTE_WRAPPER_EXTRA_CFLAGS_PREFIX@