switch from F77/FC to LAM_F77/LAM_F90 so that we don't have to assign "none"

into either F77 or F90, which caused badness in the libtool test world.

This commit was SVN r999.

config/lam_setup_f77.m4

@@ -39,21 +39,23 @@ FFLAGS="$lam_fflags_save"
 if test -z "$F77"; then
     AC_MSG_WARN([*** Fortran 77 bindings disabled (could not find compiler)])
     LAM_WANT_F77_BINDINGS=0
-    F77="none"
+    LAM_F77="none"
     BASEF77="none"
 else
     if test "$LAM_WANT_F77_BINDINGS" = "0" ; then
         AC_MSG_WARN([*** Fortran 77 bindings disabled by user])
         LAM_WANT_F77_BINDINGS=0
-        BASEF77="`basename $F77`"
+        LAM_F77="$F77"
+        BASEF77="`basename $LAM_F77`"
     else
         LAM_WANT_F77_BINDINGS=1
-        BASEF77="`basename $F77`"
+        LAM_F77="$F77"
+        BASEF77="`basename $LAM_F77`"
     fi
 fi
 
 AC_DEFINE_UNQUOTED(LAM_WANT_F77_BINDINGS, $LAM_WANT_F77_BINDINGS,
     [Whether we want the MPI f77 bindings or not])
-AC_DEFINE_UNQUOTED(LAM_F77, "$F77", [LAM underlying F77 compiler])
+AC_DEFINE_UNQUOTED(LAM_F77, "$LAM_F77", [LAM underlying F77 compiler])
 AM_CONDITIONAL(LAM_WANT_F77_BINDINGS, test "$LAM_WANT_F77_BINDINGS" = "1")
 ])

config/lam_setup_f90.m4

@@ -27,14 +27,12 @@ lam_show_subtitle "Fortran 90/95 compiler"
 if test "$LAM_WANT_F77_BINDINGS" = "0" ; then
     AC_MSG_WARN([*** Fortran 90/95 bindings disabled (Fortran 77 was disabled)])
     LAM_WANT_F90_BINDINGS=0
-    FC="none"
-    F90="$FC"
+    LAM_F90="none"
     BASEF90="none"
 elif test "$LAM_WANT_F90_BINDINGS" = "0" ; then
     AC_MSG_WARN([*** Fortran 90/95 bindings disabled by user])
     LAM_WANT_F90_BINDINGS=0
-    FC="none"
-    F90="$FC"
+    LAM_F90="none"
     BASEF90="none"
 else
 
@@ -53,19 +51,17 @@ else
     if test -z "$FC"; then
         AC_MSG_WARN([*** Fortran 90/95 bindings disabled (could not find compiler)])
         LAM_WANT_F90_BINDINGS=0
-        FC=none
-        F90=none
-        BASEF90=none
+        LAM_F90="none"
+        BASEF90="none"
     elif test "$FC" = "$F77"; then
         AC_MSG_WARN([*** Found same compiler for Fortran 77 and 90/95.])
         AC_MSG_WARN([*** Assuming no Fortran 90/95 compiler; disabling])
         AC_MSG_WARN([*** Fortran 90/95 MPI bindings.])
         LAM_WANT_F90_BINDINGS=0
-        FC=none
-        F90=none
-        BASEF90=none
+        LAM_F90="none"
+        BASEF90="none"
     else
-        F90="$FC"
+        LAM_F90="$FC"
         BASEF90="`basename $FC`"
 
         AC_LANG_PUSH(Fortran)
@@ -74,7 +70,7 @@ else
         AC_FC_SRCEXT(f95)
         AC_LANG_POP(Fortran)
 
-        AC_MSG_CHECKING([whether $F77 and $F90 compilers are compatible])
+        AC_MSG_CHECKING([whether $LAM_F77 and $LAM_F90 compilers are compatible])
         LAM_INTL_F90_F77_INTERACTION(fortran_goodness=1, fortran_goodness=0)
         if test "$fortran_goodness" = "0" ; then
             AC_MSG_RESULT([no])
@@ -90,7 +86,7 @@ fi
 
 AC_DEFINE_UNQUOTED(LAM_WANT_F90_BINDINGS, $LAM_WANT_F90_BINDINGS,
     [Whether we want the MPI f90 bindings or not])
-AC_DEFINE_UNQUOTED(LAM_F90, "$F90", [LAM underlying F90 compiler])
+AC_DEFINE_UNQUOTED(LAM_F90, "$LAM_F90", [LAM underlying F90 compiler])
 AM_CONDITIONAL(LAM_WANT_F90_BINDINGS, test "$LAM_WANT_F90_BINDINGS" = "1")
 unset fortran_goodness
 ])
@@ -112,11 +108,11 @@ EOF
 
 # Try the compile
 LAM_LOG_COMMAND(
-    [$F90 $FCFLAGS $FCFLAGS_f -c conftestf90.f],
+    [$LAM_F90 $FCFLAGS $FCFLAGS_f -c conftestf90.f],
     LAM_LOG_COMMAND(
-        [$F77 $FFLAGS -c conftestf77.f],
+        [$LAM_F77 $FFLAGS -c conftestf77.f],
         LAM_LOG_COMMAND(
-            [$F90 $FCFLAGS -o conftest conftestf90.o conftestf77.o $LIBS],
+            [$LAM_F90 $FCFLAGS -o conftest conftestf90.o conftestf77.o $LIBS],
             [HAPPY=1],
             [HAPPY=0]),
 	[HAPPY=0]),

configure.ac

@@ -181,7 +181,6 @@ LAM_C_GET_ALIGNMENT(void *, LAM_ALIGNMENT_VOID_P)
 
 AC_C_INLINE
 AC_C_RESTRICT
-AC_CHECK_HEADERS([stdbool.h alloca.h])
 LAM_C_WEAK_SYMBOLS
 
 # If we want the profiling layer:
@@ -263,8 +262,8 @@ LAM_ALIGNMENT_FORTRAN_COMPLEX=0
 LAM_ALIGNMENT_FORTRAN_DBLCOMPLEX=0
 
 LAM_SETUP_F77
-if test "$F77" != "none" ; then
-    LAM_F77_FIND_EXT_SYMBOL_CONVENTION($F77)
+if test "$LAM_F77" != "none" ; then
+    LAM_F77_FIND_EXT_SYMBOL_CONVENTION($LAM_F77)
 
     # checking the sizeof fortran interger. This is needed to define 
     # MPI_Fint. This is needed for C bindings and hence there is no
@@ -328,6 +327,8 @@ LAM_SETUP_F90
 # Header files
 ##################################
 
+lam_show_title "Header file tests"
+
 # snprintf declaration
 # gethostname declaration
 # headers:
@@ -337,6 +338,7 @@ LAM_SETUP_F90
 # SA_RESTART in signal.h
 # sa_len in struct sockaddr
 # union semun in sys/sem.h
+AC_CHECK_HEADERS([stdbool.h alloca.h])
 
 
 ##################################
@@ -391,7 +393,7 @@ lam_show_title "System-specific tests"
 # This test should be carried out ONLY if there is a f77 compiler
 # available. Else we should default to MPI_Fint being an int.
 #
-if test "$F77" != "none"; then
+if test "$LAM_F77" != "none"; then
 	MPI_FINT_TYPE="not found"
 	AC_MSG_CHECKING([checking for type of MPI_Fint])
 	if test "$LAM_SIZEOF_FORTRAN_INT" = 4 ; then