[mpich-commits] [mpich] MPICH primary repository branch, master, updated. v3.1.3-79-g28f6a68

[Service Account]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "MPICH primary repository".

The branch, master has been updated
       via  28f6a6890ef19d0f47fb217747b5e2190dfbb1ff (commit)
      from  fc7617f21a4247b75f7989ecd8063d2b3b29ae7e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.mpich.org/mpich.git/commitdiff/28f6a6890ef19d0f47fb217747b5e2190dfbb1ff

commit 28f6a6890ef19d0f47fb217747b5e2190dfbb1ff
Author: Huiwei Lu <huiweilu at mcs.anl.gov>
Date:   Thu Oct 30 16:35:32 2014 -0500

    Fixes configure.ac when no fortran is found
    
    Fixes the case when configured with default setting but with no fortran
    installed. It should give an error of 'No Fortran 77/90 compiler found'
    but not.
    
    This patch is related with [d4e30cc0], when configure was changed to
    support '--disable-fc'.
    
    Signed-off-by: Antonio J. Pena <apenya at mcs.anl.gov>

diff --git a/configure.ac b/configure.ac
index f7ffd0a..552e1d9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1880,13 +1880,15 @@ fi
 # Handle default choices for the Fortran compilers
 # Note that these have already been set above
 
-if test "$enable_f77" = "yes" -a "$F77" = "no" ; then
-   # No Fortran 77 compiler found; abort
-   AC_MSG_ERROR([No Fortran 77 compiler found. If you don't need to
-   build any Fortran programs, you can disable Fortran support using
-   --disable-fortran. If you do want to build Fortran
-   programs, you need to install a Fortran compiler such as gfortran
-   or ifort before you can proceed.])
+if test "$enable_f77" = "yes"; then
+    if test "$F77" = "" -o "$F77" = "no"; then
+        # No Fortran 77 compiler found; abort
+        AC_MSG_ERROR([No Fortran 77 compiler found. If you don't need to
+        build any Fortran programs, you can disable Fortran support using
+        --disable-fortran. If you do want to build Fortran
+        programs, you need to install a Fortran compiler such as gfortran
+        or ifort before you can proceed.])
+    fi
 fi
 
 if test "$enable_f77" = yes ; then
@@ -2054,13 +2056,15 @@ if test "$enable_fc" = "yes" -a "$enable_f77" = yes ; then
         AC_MSG_WARN([Use --disable-fc to keep configure from searching for a Fortran 90 compiler])
     fi
 
-    if test "$enable_fc" = "yes" -a "$FC" = "no" ; then
-       # No Fortran 90 compiler found; abort
-       AC_MSG_ERROR([No Fortran 90 compiler found. If you don't need
-       to build any Fortran 90 programs, you can disable Fortran 90
-       support using --disable-fc. If you do want to build Fortran 90
-       programs, you need to install a Fortran 90 compiler such as
-       gfortran or ifort before you can proceed.])
+    if test "$enable_fc" = "yes"; then
+        if test "$FC" = "no" -o "$FC" = ""; then
+            # No Fortran 90 compiler found; abort
+            AC_MSG_ERROR([No Fortran 90 compiler found. If you don't need
+            to build any Fortran 90 programs, you can disable Fortran 90
+            support using --disable-fc. If you do want to build Fortran 90
+            programs, you need to install a Fortran 90 compiler such as
+            gfortran or ifort before you can proceed.])
+        fi
     fi
 fi
 

-----------------------------------------------------------------------

Summary of changes:
 configure.ac |   32 ++++++++++++++++++--------------
 1 files changed, 18 insertions(+), 14 deletions(-)


hooks/post-receive
-- 
MPICH primary repository