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

diff --git a/Makefile.am b/Makefile.am
index af641c0..74648a2 100755
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,18 +22,17 @@
 # Top-level HDF5 Makefile(.in)
 
 # pmake has issues if variables are undefined.  Solve this problem in
-# top-level Makefile by defining all variables it complains about.
+# top-level Makefile by defining .MAKEFLAGS target to -V before pmake can
+# encounter any undefined variables.
+# Automake resists putting anything but variable definitions first in
+# a Makefile.in, so we'll put a placebo comment here and use sed in
+# bin/reconfigure to turn it into the .MAKEFLAGS target.  Sigh.  -JL 2005
 # Configure should set AM_MAKEFLAGS to -V to solve this problem in
 # subdirectories.
 # NOTE: This means that invoking pmake in a subdirectory will not work.
-CONFIG_STATUS_DEPENDENCIES=
-TAGS_DEPENDENCIES=
-TAGS_FILES=
-HEADERS=
-SOURCES=
-TEXINFOS=
-EXTRA_DIST=
-LISP=
+#xxx.MAKEFLAGS:@AM_MAKEFLAGS@
+#xxx	$(MAKE) all
+#xxx
 
 include $(top_srcdir)/config/commence.am