[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, 8 insertions, 8 deletions

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