[svn-r10158] Purpose:

Automake version upgrade

Description:
Upgraded automake version from 1.6.2 to 1.9.5.
Changed bin/reconfigure script to use automake 1.9.5.
Changed configure.in and Makefiles to use new FCFLAGS and FC variables
instead of FFLAGS and F9X.
Automake and configure should now do the lion's share of the work
supporting Fortran 9X; macros in acsite.m4 are now mostly unused (will
be cleaned later).
Altered how configure handles pmake; now root-level Makefile.in is
processed by bin/reconfigure to have a .MAKEFLAGS target, since
automake no longer allows us to define unused variables.
Configure now always checks for C++ compiler even if it is not
used, since automake thinks this is the Right Thing To Do and
will break otherwise.

Platforms tested:
Sol, copper, heping, mir, sleipnir, eirene, pommier, kelgia, modi4.

23 files changed, 178 insertions, 178 deletions

diff --git a/config/dec-flags b/config/dec-flags
index 0ff487f..881871e 100644
--- a/config/dec-flags
+++ b/config/dec-flags
@@ -107,17 +107,17 @@ HID_T='SELECTED_INT_KIND(R_INTEGER)'
 SIZE_T='SELECTED_INT_KIND(R_LARGE)'
 OBJECT_NAMELEN_DEFAULT_F=-1
 
-if test "X-" = "X-$F9X"; then
-  F9X=f90
+if test "X-" = "X-$FC"; then
+  FC=f90
 fi
 
 if test "X-" = "X-$f9x_flags_set"; then
   F9XSUFFIXFLAG=""
   FSEARCH_DIRS=""
-  FFLAGS="$FFLAGS -Olimit 2048 -std1"
-  DEBUG_FFLAGS="-Olimit 2048 -std1"
-  PROD_FFLAGS="-Olimit 2048 -std1"
-  PROFILE_FFLAGS="-Olimit 2048 -std1"
+  FCFLAGS="$FCFLAGS -Olimit 2048 -std1"
+  DEBUG_FCFLAGS="-Olimit 2048 -std1"
+  PROD_FCFLAGS="-Olimit 2048 -std1"
+  PROFILE_FCFLAGS="-Olimit 2048 -std1"
   f9x_flags_set=yes
 fi
 
diff --git a/config/freebsd b/config/freebsd
index caeca9c..c3b3904 100644
--- a/config/freebsd
+++ b/config/freebsd
@@ -22,19 +22,19 @@ CPPFLAGS="$CPPFLAGS -D_POSIX_C_SOURCE=1"
 . $srcdir/config/intel-flags
 
 # The default Fortran 90 compiler
-if test "X-" = "X-$F9X"; then
+if test "X-" = "X-$FC"; then
     case $CC_BASENAME in
         gcc*|pgcc*)
-            F9X=gfortran40
-            F9X_BASENAME=gfortran40
+            FC=gfortran40
+            FC_BASENAME=gfortran40
             ;;
         icc*)
-            F9X=ifort
-            F9X_BASENAME=ifort
+            FC=ifort
+            FC_BASENAME=ifort
             ;;
         mpicc*)
-            F9X=mpif90
-            F9X_BASENAME=mpif90
+            FC=mpif90
+            FC_BASENAME=mpif90
             ;;
     esac
 fi
diff --git a/config/gnu-fflags b/config/gnu-fflags
index f1f50d7..ec92f10 100644
--- a/config/gnu-fflags
+++ b/config/gnu-fflags
@@ -12,17 +12,17 @@
 #   f9x_version:   Version number: 5.0-2, 5.2-2
 #
 if test X = "X$f9x_flags_set"; then
-    f9x_version="`$F9X $FFLAGS -v 2>&1 |grep 'gcc version' |\
+    f9x_version="`$FC $FCFLAGS -v 2>&1 |grep 'gcc version' |\
 	        sed 's/.*gcc version \([-a-z0-9\.]*\).*/\1/'`"
     if test X != "X$f9x_version"; then
-#        is_mpi="`$F9X $FFLAGS -help 2>&1 |grep 'link MPI'`"
+#        is_mpi="`$FC $FCFLAGS -help 2>&1 |grep 'link MPI'`"
         f9x_vendor=`echo $f9x_version |sed 's/\([a-z]*\).*/\1/'`
         f9x_version=`echo $f9x_version |sed 's/[-a-z]//g'`
         if test X = "X$f9x_vendor" -a X != "X$f9x_version"; then
             f9x_vendor=gfortran
         fi
         if test "-" != "$f9x_vendor-$f9x_version"; then
-            echo "compiler '$F9X' is GNU $f9x_vendor-$f9x_version"
+            echo "compiler '$FC' is GNU $f9x_vendor-$f9x_version"
         fi
 
         # Some version numbers
@@ -59,19 +59,19 @@ if test "X-gfortran" = "X-$f9x_vendor"; then
     #esac
 
     # General
-    F9X_BASENAME=gfortran40
+    FC_BASENAME=gfortran40
     F9XSUFFIXFLAG=""
     FSEARCH_DIRS=""
-    FFLAGS="$FFLAGS -pedantic -Wall -Wconversion -Wunderflow -Wimplicit-interface -W"
+    FCFLAGS="$FCFLAGS -pedantic -Wall -Wconversion -Wunderflow -Wimplicit-interface -W"
 
     # Production
-    PROD_FFLAGS="-O2 -s"
+    PROD_FCFLAGS="-O2 -s"
 
     # Debug
-    DEBUG_FFLAGS="-g -fbounds-check"
+    DEBUG_FCFLAGS="-g -fbounds-check"
 
     # Profile
-    PROFILE_FFLAGS="-g -pg"
+    PROFILE_FCFLAGS="-g -pg"
 
     # Flags are set
     f9x_flags_set=yes
diff --git a/config/hpux10.20 b/config/hpux10.20
index ff88bc9..fdd4dd1 100644
--- a/config/hpux10.20
+++ b/config/hpux10.20
@@ -54,16 +54,16 @@ HID_T='SELECTED_INT_KIND(R_INTEGER)'
 SIZE_T='SELECTED_INT_KIND(R_INTEGER)'
 OBJECT_NAMELEN_DEFAULT_F=-1
 
-if test "X-" = "X-$F9X"; then
-  F9X=f90
+if test "X-" = "X-$FC"; then
+  FC=f90
 fi
 
 if test "X-" = "X-$f9x_flags_set"; then
   F9XSUFFIXFLAG=""
   FSEARCH_DIRS=""
-  FFLAGS="$FFLAGS -O"
-  DEBUG_FFLAGS="-O"
-  PROD_FFLAGS="-O"
-  PROFILE_FFLAGS="-O"
+  FCFLAGS="$FCFLAGS -O"
+  DEBUG_FCFLAGS="-O"
+  PROD_FCFLAGS="-O"
+  PROFILE_FCFLAGS="-O"
   f9x_flags_set=yes
 fi
diff --git a/config/hpux11.00 b/config/hpux11.00
index f42839a..7cb01d4 100644
--- a/config/hpux11.00
+++ b/config/hpux11.00
@@ -54,17 +54,17 @@ HID_T='SELECTED_INT_KIND(R_INTEGER)'
 SIZE_T='SELECTED_INT_KIND(R_INTEGER)'
 OBJECT_NAMELEN_DEFAULT_F=-1
 
-if test "X$F9X" = "X"; then
-  F9X=f90
+if test "X$FC" = "X"; then
+  FC=f90
 fi
 
 if test "X$f9x_flags_set" = "X"; then
   F9XSUFFIXFLAG=""
   FSEARCH_DIRS=""
-  FFLAGS="$FFLAGS -O"
-  DEBUG_FFLAGS="-O"
-  PROD_FFLAGS="-O"
-  PROFILE_FFLAGS="-O"
+  FCFLAGS="$FCFLAGS -O"
+  DEBUG_FCFLAGS="-O"
+  PROD_FCFLAGS="-O"
+  PROFILE_FCFLAGS="-O"
   f9x_flags_set=yes
 fi
 
diff --git a/config/i686-pc-cygwin b/config/i686-pc-cygwin
index 3b2f184..49054a1 100644
--- a/config/i686-pc-cygwin
+++ b/config/i686-pc-cygwin
@@ -22,23 +22,23 @@ fi
 . $srcdir/config/intel-flags
 
 # The default Fortran 90 compiler
-if test "X-" = "X-$F9X"; then
+if test "X-" = "X-$FC"; then
     case $CC_BASENAME in
         gcc*|pgcc*)
-            F9X=pgf90
-            F9X_BASENAME=pgf90
+            FC=pgf90
+            FC_BASENAME=pgf90
             ;;
         icc*)
-            F9X=ifort
-            F9X_BASENAME=ifort
+            FC=ifort
+            FC_BASENAME=ifort
             ;;
         mpicc*)
-            F9X=mpif90
-            F9X_BASENAME=mpif90
+            FC=mpif90
+            FC_BASENAME=mpif90
             ;;
     esac
 else
-    case $F9X in
+    case $FC in
         # The PGI and Intel compilers are automatically detected below
         ifc*|ifort*|pgf90*)
             ;;
@@ -47,13 +47,13 @@ else
             # Figure out which compiler we are using: pgf90 or Absoft f95
             RM='rm -f'
             tmpfile=/tmp/cmpver.$$
-            $F9X -V >$tmpfile
+            $FC -V >$tmpfile
             if test -s "$tmpfile"; then 
                 if( grep -s 'Absoft' $tmpfile > /dev/null) then
-                    F9X_BASENAME=f95
+                    FC_BASENAME=f95
                 fi 
                 if( grep -s 'pgf90' $tmpfile > /dev/null) then
-                    F9X_BASENAME=pgf90
+                    FC_BASENAME=pgf90
                 fi 
             fi
             $RM $tmpfile
@@ -84,7 +84,7 @@ OBJECT_NAMELEN_DEFAULT_F=-1
 # Figure out Intel F90 compiler flags
 . $srcdir/config/intel-fflags
 
-case $F9X_BASENAME in
+case $FC_BASENAME in
     #
     # Absoft compiler
     #
@@ -95,11 +95,11 @@ case $F9X_BASENAME in
         F9XSUFFIXFLAG=""
 # We force compiler to use upper case for external names 
 # (just in case since this should be a default EIP)
-        FFLAGS="$FFLAGS -YEXT_NAMES=UCS"
+        FCFLAGS="$FCFLAGS -YEXT_NAMES=UCS"
         FSEARCH_DIRS=""
-        DEBUG_FFLAGS="-g"
-        PROD_FFLAGS="-O"
-        PROFILE_FFLAGS="-g -pg"
+        DEBUG_FCFLAGS="-g"
+        PROD_FCFLAGS="-O"
+        PROFILE_FCFLAGS="-g -pg"
         f9x_flags_set=yes
         ;;
 
diff --git a/config/ia64-linux-gnu b/config/ia64-linux-gnu
index d553ef4..8cdfd1c 100644
--- a/config/ia64-linux-gnu
+++ b/config/ia64-linux-gnu
@@ -50,16 +50,16 @@ R_LARGE=18
 R_INTEGER=9
 
 # Use Intel Fortran compiler by default.
-if test "X-$F9X" = "X-"; then
-  F9X="ifort"
+if test "X-$FC" = "X-"; then
+  FC="ifort"
 fi
 
-case $F9X in
+case $FC in
   *efc|*ifort)
     # this is for efc v7.  Older efc do not work with these.
     # -Vaxlib is for non-standard fortran calls like exit().
-    MORE_FFLAGS='-fpp -DDEC$=DEC_ -DMS$=MS_ -Vaxlib'
-    FFLAGS="$FFLAGS $MORE_FFLAGS"
+    MORE_FCFLAGS='-fpp -DDEC$=DEC_ -DMS$=MS_ -Vaxlib'
+    FCFLAGS="$FCFLAGS $MORE_FCFLAGS"
     HADDR_T='SELECTED_INT_KIND(R_LARGE)'
     HSIZE_T='SELECTED_INT_KIND(R_LARGE)'
     HSSIZE_T='SELECTED_INT_KIND(R_LARGE)'
@@ -84,10 +84,10 @@ esac
 if test "X$f9x_flags_set" = "X"; then
   F9XSUFFIXFLAG=""
   FSEARCH_DIRS=""
-  FFLAGS="$FFLAGS"
-  DEBUG_FFLAGS=""
-  PROD_FFLAGS=""
-  PROFILE_FFLAGS=""
+  FCFLAGS="$FCFLAGS"
+  DEBUG_FCFLAGS=""
+  PROD_FCFLAGS=""
+  PROFILE_FCFLAGS=""
   f9x_flags_set=yes
 fi
 
diff --git a/config/intel-fflags b/config/intel-fflags
index 0a65f0e..51ba6d0 100644
--- a/config/intel-fflags
+++ b/config/intel-fflags
@@ -12,11 +12,11 @@
 #   f9x_version:   Version number: 8.0
 #
 if test X = "X$f9x_flags_set"; then
-    f9x_version="`$F9X $FFLAGS -V 2>&1 |grep '^Intel'`"
+    f9x_version="`$FC $FCFLAGS -V 2>&1 |grep '^Intel'`"
     if test X != "X$f9x_version"; then
         f9x_vendor=ifort
         f9x_version="`echo $f9x_version |sed 's/.*Version \([-a-z0-9\.\-]*\).*/\1/'`"
-        echo "compiler '$F9X' is Intel $f9x_vendor-$f9x_version"
+        echo "compiler '$FC' is Intel $f9x_vendor-$f9x_version"
 
         # Some version numbers
         # Intel version numbers are of the form: "major.minor"
@@ -53,20 +53,20 @@ if test "X-ifort" = "X-$f9x_vendor"; then
     #esac
 
     # General
-    F9X_BASENAME=ifort
+    FC_BASENAME=ifort
     F9XSUFFIXFLAG=""
     FSEARCH_DIRS=""
-    FFLAGS="$FFLAGS"
+    FCFLAGS="$FCFLAGS"
 
     # Production
-    PROD_FFLAGS="-O3"
+    PROD_FCFLAGS="-O3"
 
     # Debug
-    DEBUG_FFLAGS="-g -check all"
+    DEBUG_FCFLAGS="-g -check all"
 
     # Profile
     # Use this for profiling with gprof
-    PROFILE_FFLAGS="-g -p"
+    PROFILE_FCFLAGS="-g -p"
 
     # Flags are set
     f9x_flags_set=yes
diff --git a/config/irix6.x b/config/irix6.x
index 5d4264b..61f6189 100644
--- a/config/irix6.x
+++ b/config/irix6.x
@@ -110,17 +110,17 @@ HID_T='SELECTED_INT_KIND(R_INTEGER)'
 SIZE_T='SELECTED_INT_KIND(R_LARGE)'
 OBJECT_NAMELEN_DEFAULT_F=-1
 
-if test "X-" = "X-$F9X"; then
-  F9X="f90"
+if test "X-" = "X-$FC"; then
+  FC="f90"
 fi
 
 if test "X-" = "X-$f9x_flags_set"; then
   F9XSUFFIXFLAG=""
   FSEARCH_DIRS=""
-  FFLAGS="$FFLAGS -64 -mips4 -O -s"
-  DEBUG_FFLAGS="-64 -mips4 -O -s"
-  PROD_FFLAGS="-64 -mips4 -O -s"
-  PROFILE_FFLAGS="-64 -mips4 -O -s"
+  FCFLAGS="$FCFLAGS -64 -mips4 -O -s"
+  DEBUG_FCFLAGS="-64 -mips4 -O -s"
+  PROD_FCFLAGS="-64 -mips4 -O -s"
+  PROFILE_FCFLAGS="-64 -mips4 -O -s"
   f9x_flags_set=yes
 fi
 
diff --git a/config/linux-gnulibc1 b/config/linux-gnulibc1
index 3b2f184..49054a1 100644
--- a/config/linux-gnulibc1
+++ b/config/linux-gnulibc1
@@ -22,23 +22,23 @@ fi
 . $srcdir/config/intel-flags
 
 # The default Fortran 90 compiler
-if test "X-" = "X-$F9X"; then
+if test "X-" = "X-$FC"; then
     case $CC_BASENAME in
         gcc*|pgcc*)
-            F9X=pgf90
-            F9X_BASENAME=pgf90
+            FC=pgf90
+            FC_BASENAME=pgf90
             ;;
         icc*)
-            F9X=ifort
-            F9X_BASENAME=ifort
+            FC=ifort
+            FC_BASENAME=ifort
             ;;
         mpicc*)
-            F9X=mpif90
-            F9X_BASENAME=mpif90
+            FC=mpif90
+            FC_BASENAME=mpif90
             ;;
     esac
 else
-    case $F9X in
+    case $FC in
         # The PGI and Intel compilers are automatically detected below
         ifc*|ifort*|pgf90*)
             ;;
@@ -47,13 +47,13 @@ else
             # Figure out which compiler we are using: pgf90 or Absoft f95
             RM='rm -f'
             tmpfile=/tmp/cmpver.$$
-            $F9X -V >$tmpfile
+            $FC -V >$tmpfile
             if test -s "$tmpfile"; then 
                 if( grep -s 'Absoft' $tmpfile > /dev/null) then
-                    F9X_BASENAME=f95
+                    FC_BASENAME=f95
                 fi 
                 if( grep -s 'pgf90' $tmpfile > /dev/null) then
-                    F9X_BASENAME=pgf90
+                    FC_BASENAME=pgf90
                 fi 
             fi
             $RM $tmpfile
@@ -84,7 +84,7 @@ OBJECT_NAMELEN_DEFAULT_F=-1
 # Figure out Intel F90 compiler flags
 . $srcdir/config/intel-fflags
 
-case $F9X_BASENAME in
+case $FC_BASENAME in
     #
     # Absoft compiler
     #
@@ -95,11 +95,11 @@ case $F9X_BASENAME in
         F9XSUFFIXFLAG=""
 # We force compiler to use upper case for external names 
 # (just in case since this should be a default EIP)
-        FFLAGS="$FFLAGS -YEXT_NAMES=UCS"
+        FCFLAGS="$FCFLAGS -YEXT_NAMES=UCS"
         FSEARCH_DIRS=""
-        DEBUG_FFLAGS="-g"
-        PROD_FFLAGS="-O"
-        PROFILE_FFLAGS="-g -pg"
+        DEBUG_FCFLAGS="-g"
+        PROD_FCFLAGS="-O"
+        PROFILE_FCFLAGS="-g -pg"
         f9x_flags_set=yes
         ;;
 
diff --git a/config/pgi-fflags b/config/pgi-fflags
index a5e7431..0da851b 100644
--- a/config/pgi-fflags
+++ b/config/pgi-fflags
@@ -12,12 +12,12 @@
 #   f9x_version:   Version number: 5.0-2, 5.2-2
 #
 if test X = "X$f9x_flags_set"; then
-    f9x_version="`$F9X $FFLAGS -V 2>&1 |grep '^pgf90 '`"
+    f9x_version="`$FC $FCFLAGS -V 2>&1 |grep '^pgf90 '`"
     if test X != "X$f9x_version"; then
-        is_mpi="`$F9X $FFLAGS -help 2>&1 |grep 'link MPI'`"
+        is_mpi="`$FC $FCFLAGS -help 2>&1 |grep 'link MPI'`"
         f9x_vendor=`echo $f9x_version |sed 's/\([a-z0-9]*\).*/\1/'`
         f9x_version=`echo $f9x_version |sed 's/pgf90 \([-a-z0-9\.\-]*\).*/\1/'`
-        echo "compiler '$F9X' is PGI $f9x_vendor-$f9x_version"
+        echo "compiler '$FC' is PGI $f9x_vendor-$f9x_version"
 
         # Some version numbers
         # PGI version numbers are of the form: "major.minor-patch"
@@ -54,29 +54,29 @@ if test "X-pgf90" = "X-$f9x_vendor"; then
     #esac
 
     # General
-    F9X_BASENAME=pgf90
+    FC_BASENAME=pgf90
     F9XSUFFIXFLAG=""
     FSEARCH_DIRS=""
-    FFLAGS="$FFLAGS -Mdclchk -Mstandard -Minform,warn"
+    FCFLAGS="$FCFLAGS -Mdclchk -Mstandard -Minform,warn"
 
     # Production
     # Check for MPI wrapper being used and tweak down compiler options
     # Comment out the Tweaking since it caused problems to mpich1.2.6.
     # Need to investigate the reasons to tweak.
     #if test "X-" == "X-$is_mpi"; then
-    #    PROD_FFLAGS="-fast -s -Mnoframe"
+    #    PROD_FCFLAGS="-fast -s -Mnoframe"
     #else
-    #    PROD_FFLAGS="-O2 -s"
+    #    PROD_FCFLAGS="-O2 -s"
     #fi
-    PROD_FFLAGS="-fast -s -Mnoframe"
+    PROD_FCFLAGS="-fast -s -Mnoframe"
 
     # Debug
-    DEBUG_FFLAGS="-g -Mbounds -Mchkfpstk -Mchkptr"
+    DEBUG_FCFLAGS="-g -Mbounds -Mchkfpstk -Mchkptr"
 
     # Profile
-    PROFILE_FFLAGS="-g -Mprof=func,line"
+    PROFILE_FCFLAGS="-g -Mprof=func,line"
     # Use this for profiling with gprof
-    #PROFILE_FFLAGS="-g -pg"
+    #PROFILE_FCFLAGS="-g -pg"
 
     # Flags are set
     f9x_flags_set=yes
diff --git a/config/powerpc-apple b/config/powerpc-apple
index 1ea17c8..243f8ed 100644
--- a/config/powerpc-apple
+++ b/config/powerpc-apple
@@ -15,12 +15,12 @@ fi
 . $srcdir/config/gnu-flags
 
 # The default Fortran 90 compiler
-if test "X-" = "X-$F9X"; then
+if test "X-" = "X-$FC"; then
     # Assume Absoft compiler
-    F9X=xlf
-    F9X_BASENAME=xlf
+    FC=xlf
+    FC_BASENAME=xlf
   else
-    F9X_BASENAME=f95
+    FC_BASENAME=f95
     
 fi
 
@@ -41,14 +41,14 @@ HID_T='SELECTED_INT_KIND(R_INTEGER)'
 SIZE_T='SELECTED_INT_KIND(R_INTEGER)'
 OBJECT_NAMELEN_DEFAULT_F=-1
 
-case $F9X_BASENAME in
+case $FC_BASENAME in
     xlf) 
         F9XSUFFIXFLAG="-qsuffix=f=f90 -qfree=f90"
-        FFLAGS="$FFLAGS -static -O ${F9XSUFFIXFLAG} -qmoddir=./ "
+        FCFLAGS="$FCFLAGS -static -O ${F9XSUFFIXFLAG} -qmoddir=./ "
         FSEARCH_DIRS="-I./ -I../src"
-        DEBUG_FFLAGS="-g"
-        PROD_FFLAGS="-O"
-        PROFILE_FFLAGS="-g"
+        DEBUG_FCFLAGS="-g"
+        PROD_FCFLAGS="-O"
+        PROFILE_FCFLAGS="-g"
         f9x_flags_set=yes
         ;;
 
@@ -59,11 +59,11 @@ case $F9X_BASENAME in
         F9XSUFFIXFLAG=""
 # We force compiler to use upper case for external names 
 # (just in case since this should be a default EIP)
-        FFLAGS="$FFLAGS -YEXT_NAMES=UCS"
+        FCFLAGS="$FCFLAGS -YEXT_NAMES=UCS"
         FSEARCH_DIRS=""
-        DEBUG_FFLAGS="-g"
-        PROD_FFLAGS="-O"
-        PROFILE_FFLAGS="-g -pg"
+        DEBUG_FCFLAGS="-g"
+        PROD_FCFLAGS="-O"
+        PROFILE_FCFLAGS="-g -pg"
         f9x_flags_set=yes
         ;;
 
diff --git a/config/powerpc-ibm-aix4.x b/config/powerpc-ibm-aix4.x
index 8ca73f1..eb93a71 100644
--- a/config/powerpc-ibm-aix4.x
+++ b/config/powerpc-ibm-aix4.x
@@ -102,17 +102,17 @@ HID_T='SELECTED_INT_KIND(R_INTEGER)'
 SIZE_T='SELECTED_INT_KIND(R_INTEGER)'
 OBJECT_NAMELEN_DEFAULT_F=-1
 
-if test "X-" = "X-$F9X"; then
-  F9X=xlf
+if test "X-" = "X-$FC"; then
+  FC=xlf
 fi
 
 if test "X-" = "X-$f9x_flags_set"; then
   F9XSUFFIXFLAG="-qsuffix=f=f90"
-  FFLAGS="$FFLAGS -static -O ${F9XSUFFIXFLAG} -qmoddir=./ -k"
+  FCFLAGS="$FCFLAGS -static -O ${F9XSUFFIXFLAG} -qmoddir=./ -k"
   FSEARCH_DIRS="-I./ -I../src"
-  DEBUG_FFLAGS="-O"
-  PROD_FFLAGS="-O"
-  PROFILE_FFLAGS="-O"
+  DEBUG_FCFLAGS="-O"
+  PROD_FCFLAGS="-O"
+  PROFILE_FCFLAGS="-O"
   f9x_flags_set=yes
 fi
 
diff --git a/config/powerpc-ibm-aix5.x b/config/powerpc-ibm-aix5.x
index ede1701..9ff4f4e 100644
--- a/config/powerpc-ibm-aix5.x
+++ b/config/powerpc-ibm-aix5.x
@@ -127,21 +127,21 @@ HID_T='SELECTED_INT_KIND(R_INTEGER)'
 SIZE_T='SELECTED_INT_KIND(R_INTEGER)'
 OBJECT_NAMELEN_DEFAULT_F=-1
 
-if test "X-" = "X-$F9X"; then
+if test "X-" = "X-$FC"; then
   if test "X-$enable_parallel" = "X-yes"; then
-    F9X=mpxlf_r
+    FC=mpxlf_r
   else
-    F9X=xlf
+    FC=xlf
   fi
 fi
 
 if test "X-" = "X-$f9x_flags_set"; then
   F9XSUFFIXFLAG="-qsuffix=f=f90"
-  FFLAGS="$FFLAGS -static -O ${F9XSUFFIXFLAG} -qmoddir=./ -k"
+  FCFLAGS="$FCFLAGS -static -O ${F9XSUFFIXFLAG} -qmoddir=./ -k"
   FSEARCH_DIRS="-I./ -I../src"
-  DEBUG_FFLAGS="-O"
-  PROD_FFLAGS="-O"
-  PROFILE_FFLAGS="-O"
+  DEBUG_FCFLAGS="-O"
+  PROD_FCFLAGS="-O"
+  PROFILE_FCFLAGS="-O"
   f9x_flags_set=yes
 fi
 
diff --git a/config/rs6000-ibm-aix4.x b/config/rs6000-ibm-aix4.x
index 3c528d2..985a8c5 100644
--- a/config/rs6000-ibm-aix4.x
+++ b/config/rs6000-ibm-aix4.x
@@ -29,16 +29,16 @@ HID_T='SELECTED_INT_KIND(R_INTEGER)'
 SIZE_T='SELECTED_INT_KIND(R_INTEGER)'
 OBJECT_NAMELEN_DEFAULT_F=-1
 
-if test "X-" = "X-$F9X"; then
-  F9X=xlf
+if test "X-" = "X-$FC"; then
+  FC=xlf
 fi
 
 if test "X-" = "X-$f9x_flags_set"; then
   F9XSUFFIXFLAG="-qsuffix=f=f90"
-  FFLAGS="$FFLAGS -static -O ${F9XSUFFIXFLAG} -qmoddir=./ -k"
+  FCFLAGS="$FCFLAGS -static -O ${F9XSUFFIXFLAG} -qmoddir=./ -k"
   FSEARCH_DIRS="-I./ -I../src"
-  DEBUG_FFLAGS="-O"
-  PROD_FFLAGS="-O"
-  PROFILE_FFLAGS="-O"
+  DEBUG_FCFLAGS="-O"
+  PROD_FCFLAGS="-O"
+  PROFILE_FCFLAGS="-O"
   f9x_flags_set=yes
 fi
diff --git a/config/solaris2.x b/config/solaris2.x
index 760ce6f..0e596ad 100644
--- a/config/solaris2.x
+++ b/config/solaris2.x
@@ -54,17 +54,17 @@ HID_T='SELECTED_INT_KIND(R_INTEGER)'
 SIZE_T='SELECTED_INT_KIND(R_INTEGER)'
 OBJECT_NAMELEN_DEFAULT_F=-1
 
-if test "X-" = "X-$F9X"; then
-  F9X=f90
+if test "X-" = "X-$FC"; then
+  FC=f90
 fi
 
 if test "X-" = "X-$f9x_flags_set"; then
   F9XSUFFIXFLAG=""
   FSEARCH_DIRS=""
-  FFLAGS="$FFLAGS"
-  DEBUG_FFLAGS=""
-  PROD_FFLAGS=""
-  PROFILE_FFLAGS=""
+  FCFLAGS="$FCFLAGS"
+  DEBUG_FCFLAGS=""
+  PROD_FCFLAGS=""
+  PROFILE_FCFLAGS=""
   f9x_flags_set=yes
 fi
 
diff --git a/config/sv1-cray b/config/sv1-cray
index c11cde3..5724807 100644
--- a/config/sv1-cray
+++ b/config/sv1-cray
@@ -159,17 +159,17 @@ HID_T='SELECTED_INT_KIND(R_INTEGER)'
 SIZE_T='SELECTED_INT_KIND(R_LARGE)'
 OBJECT_NAMELEN_DEFAULT_F=-1
 
-if test "X-" = "X-$F9X"; then
-  F9X=f90
+if test "X-" = "X-$FC"; then
+  FC=f90
 fi
 
 if test "X-" = "X-$f9x_flags_set"; then
   F9XSUFFIXFLAG=""
   FSEARCH_DIRS=""
-  FFLAGS="$FFLAGS -dp"
-  DEBUG_FFLAGS="-dp"
-  PROD_FFLAGS="-dp"
-  PROFILE_FFLAGS="-dp"
+  FCFLAGS="$FCFLAGS -dp"
+  DEBUG_FCFLAGS="-dp"
+  PROD_FCFLAGS="-dp"
+  PROFILE_FCFLAGS="-dp"
   f9x_flags_set=yes
 fi
 
diff --git a/config/unicos b/config/unicos
index 14a91b8..8d26b20 100644
--- a/config/unicos
+++ b/config/unicos
@@ -153,16 +153,16 @@ HID_T='SELECTED_INT_KIND(R_INTEGER)'
 SIZE_T='SELECTED_INT_KIND(R_LARGE)'
 OBJECT_NAMELEN_DEFAULT_F=-1
 
-if test "X-" = "X-$F9X"; then
-  F9X=f90
+if test "X-" = "X-$FC"; then
+  FC=f90
 fi
 
 if test "X-" = "X-$f9x_flags_set"; then
   F9XSUFFIXFLAG=""
   FSEARCH_DIRS=""
-  FFLAGS="$FFLAGS -dp"
-  DEBUG_FFLAGS="-dp"
-  PROD_FFLAGS="-dp"
-  PROFILE_FFLAGS="-dp"
+  FCFLAGS="$FCFLAGS -dp"
+  DEBUG_FCFLAGS="-dp"
+  PROD_FCFLAGS="-dp"
+  PROFILE_FCFLAGS="-dp"
   f9x_flags_set=yes
 fi
diff --git a/config/unicos10.0.X b/config/unicos10.0.X
index ba314be..d036ac1 100644
--- a/config/unicos10.0.X
+++ b/config/unicos10.0.X
@@ -160,17 +160,17 @@ HID_T='SELECTED_INT_KIND(R_INTEGER)'
 SIZE_T='SELECTED_INT_KIND(R_LARGE)'
 OBJECT_NAMELEN_DEFAULT_F=-1
 
-if test "X-" = "X-$F9X"; then
-  F9X=f90
+if test "X-" = "X-$FC"; then
+  FC=f90
 fi
 
 if test "X-" = "X-$f9x_flags_set"; then
   F9XSUFFIXFLAG=""
   FSEARCH_DIRS=""
-  FFLAGS="$FFLAGS -dp"
-  DEBUG_FFLAGS="-dp"
-  PROD_FFLAGS="-dp"
-  PROFILE_FFLAGS="-dp"
+  FCFLAGS="$FCFLAGS -dp"
+  DEBUG_FCFLAGS="-dp"
+  PROD_FCFLAGS="-dp"
+  PROFILE_FCFLAGS="-dp"
   f9x_flags_set=yes
 fi
 
diff --git a/config/unicosmk b/config/unicosmk
index 2b94bbe..3f77220 100644
--- a/config/unicosmk
+++ b/config/unicosmk
@@ -156,16 +156,16 @@ HID_T='SELECTED_INT_KIND(R_INTEGER)'
 SIZE_T='SELECTED_INT_KIND(R_LARGE)'
 OBJECT_NAMELEN_DEFAULT_F=-1
 
-if test "X-" = "X-$F9X"; then
-  F9X=f90
+if test "X-" = "X-$FC"; then
+  FC=f90
 fi
 
 if test "X-" = "X-$f9x_flags_set"; then
   F9XSUFFIXFLAG=""
   FSEARCH_DIRS=""
-  FFLAGS="$FFLAGS -dp"
-  DEBUG_FFLAGS="-dp"
-  PROD_FFLAGS="-dp"
-  PROFILE_FFLAGS="-dp"
+  FCFLAGS="$FCFLAGS -dp"
+  DEBUG_FCFLAGS="-dp"
+  PROD_FCFLAGS="-dp"
+  PROFILE_FCFLAGS="-dp"
   f9x_flags_set=yes
 fi
diff --git a/config/unicosmk2.0.5.X b/config/unicosmk2.0.5.X
index d1a9464..e15de87 100644
--- a/config/unicosmk2.0.5.X
+++ b/config/unicosmk2.0.5.X
@@ -156,8 +156,8 @@ HID_T='SELECTED_INT_KIND(R_INTEGER)'
 SIZE_T='SELECTED_INT_KIND(R_LARGE)'
 OBJECT_NAMELEN_DEFAULT_F=-1
 
-if test "X-" = "X-$F9X"; then
-  F9X=f90
+if test "X-" = "X-$FC"; then
+  FC=f90
 fi
 
 if test "X-" = "X-$f9x_flags_set"; then
@@ -165,9 +165,9 @@ if test "X-" = "X-$f9x_flags_set"; then
   # number #. Warning 405 was stopping the executable from being built.
   F9XSUFFIXFLAG=""
   FSEARCH_DIRS=""
-  FFLAGS="$FFLAGS -dp -Wl-M405"
-  DEBUG_FFLAGS=""
-  PROD_FFLAGS=""
-  PROFILE_FFLAGS=""
+  FCFLAGS="$FCFLAGS -dp -Wl-M405"
+  DEBUG_FCFLAGS=""
+  PROD_FCFLAGS=""
+  PROFILE_FCFLAGS=""
   f9x_flags_set=yes
 fi
diff --git a/config/unicosmk2.0.6.X b/config/unicosmk2.0.6.X
index c5e37c3..e49ab7c 100644
--- a/config/unicosmk2.0.6.X
+++ b/config/unicosmk2.0.6.X
@@ -160,8 +160,8 @@ HID_T='SELECTED_INT_KIND(R_INTEGER)'
 SIZE_T='SELECTED_INT_KIND(R_LARGE)'
 OBJECT_NAMELEN_DEFAULT_F=-1
 
-if test "X-" = "X-$F9X"; then
-  F9X=f90
+if test "X-" = "X-$FC"; then
+  FC=f90
 fi
 
 if test "X-" = "X-$f9x_flags_set"; then
@@ -169,10 +169,10 @@ if test "X-" = "X-$f9x_flags_set"; then
   # number #. Warning 405 and 412 were stopping the executable from being built.
   F9XSUFFIXFLAG=""
   FSEARCH_DIRS=""
-  FFLAGS="$FFLAGS -dp -Wl-M405,412"
-  DEBUG_FFLAGS=""
-  PROD_FFLAGS=""
-  PROFILE_FFLAGS=""
+  FCFLAGS="$FCFLAGS -dp -Wl-M405,412"
+  DEBUG_FCFLAGS=""
+  PROD_FCFLAGS=""
+  PROFILE_FCFLAGS=""
   f9x_flags_set=yes
 fi
 
diff --git a/config/unicosmk2.0.X b/config/unicosmk2.0.X
index 89c07a7..efe7c71 100644
--- a/config/unicosmk2.0.X
+++ b/config/unicosmk2.0.X
@@ -156,8 +156,8 @@ HID_T='SELECTED_INT_KIND(R_INTEGER)'
 SIZE_T='SELECTED_INT_KIND(R_LARGE)'
 OBJECT_NAMELEN_DEFAULT_F=-1
 
-if test "X-" = "X-$F9X"; then
-  F9X=f90
+if test "X-" = "X-$FC"; then
+  FC=f90
 fi
 
 if test "X-" = "X-$f9x_flags_set"; then
@@ -165,9 +165,9 @@ if test "X-" = "X-$f9x_flags_set"; then
   # number #. Warning 405 was stopping the executable from being built.
   F9XSUFFIXFLAG=""
   FSEARCH_DIRS=""
-  FFLAGS="$FFLAGS -dp -Wl-M405"
-  DEBUG_FFLAGS=""
-  PROD_FFLAGS=""
-  PROFILE_FFLAGS=""
+  FCFLAGS="$FCFLAGS -dp -Wl-M405"
+  DEBUG_FCFLAGS=""
+  PROD_FCFLAGS=""
+  PROFILE_FCFLAGS=""
   f9x_flags_set=yes
 fi