From ecd71083241937f2530d2edffb3cf6077b0667fd Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Thu, 19 Apr 2012 13:20:08 +0000 Subject: [PATCH] Fix problem of conflicting configure variables. This commit was SVN r26302. --- ompi/config/ompi_setup_fc.m4 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ompi/config/ompi_setup_fc.m4 b/ompi/config/ompi_setup_fc.m4 index c672513310..4a9fe80652 100644 --- a/ompi/config/ompi_setup_fc.m4 +++ b/ompi/config/ompi_setup_fc.m4 @@ -32,6 +32,7 @@ AC_DEFUN_ONCE([_OMPI_SETUP_FC_BANNER],[ # This is REQUIREd, below. AC_DEFUN_ONCE([_OMPI_SETUP_FC_COMPILER],[ + OPAL_VAR_SCOPE_PUSH([ompi_fcflags_save]) ompi_fcflags_save="$FCFLAGS" # Note that AC_PROG_FC will look for *any* fortran compiler, and # we don't want it to find an F77-only compiler. The AC docs @@ -42,13 +43,14 @@ AC_DEFUN_ONCE([_OMPI_SETUP_FC_COMPILER],[ # reason we have an OMPI-ized version of the PROG_FC macro. AC_PROG_FC([gfortran f95 fort xlf95 ifort ifc efc pgfortran pgf95 lf95 f90 xlf90 pgf90 epcf90]) FCFLAGS="$ompi_fcflags_save" + OPAL_VAR_SCOPE_POP ]) ############################################################################# # General Fortran compiler setup AC_DEFUN([OMPI_SETUP_FC],[ - OPAL_VAR_SCOPE_PUSH([ompi_fcflags_save ompi_fc_happy]) + OPAL_VAR_SCOPE_PUSH([ompi_fc_happy]) # Force the intro banner to be displayed first AC_REQUIRE([_OMPI_SETUP_FC_BANNER])