[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.

1 files changed, 11 insertions, 11 deletions

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