diff --git a/configure b/configure
index e31513c1..fdbb3727 100755
--- a/configure
+++ b/configure
@@ -4260,7 +4260,6 @@ _ACEOF
         :
 fi
 
-fi
 
 ac_ext=f
 ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
@@ -4688,6 +4687,7 @@ _ACEOF
         :
 fi
 
+fi
 
 # We leave a default language for the next checks.
 ac_ext=c
diff --git a/configure.ac b/configure.ac
index 3aaf246f..7ed3ebf4 100755
--- a/configure.ac
+++ b/configure.ac
@@ -141,7 +141,6 @@ if test "X$MPIFC" = "X" ; then
 fi
 
 ACX_MPI([], [AC_MSG_ERROR([[Cannot find any suitable MPI implementation for Fortran]])])
-fi
 
 AC_LANG(Fortran 77)
 if test "X$MPIF77" = "X" ; then
@@ -149,6 +148,7 @@ if test "X$MPIF77" = "X" ; then
     AC_CHECK_PROGS([MPIF77],[mpxlf mpf77 mpif77])
 fi
 ACX_MPI([], [AC_MSG_ERROR([[Cannot find any suitable MPI implementation for Fortran 77]])])
+fi
 
 # We leave a default language for the next checks.
 dnl AC_LANG([Fortran 77])