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

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