diff options
| author | James Laird <jlaird@hdfgroup.org> | 2005-03-07 17:57:27 (GMT) |
|---|---|---|
| committer | James Laird <jlaird@hdfgroup.org> | 2005-03-07 17:57:27 (GMT) |
| commit | 25df1908bc0430994cecc9f1415838f42fe0c816 (patch) | |
| tree | bce2777e087cc7d547e7b644f908eff72282bb53 /bin | |
| parent | 630b2901c53c66c837e39babe9da0c20020e5d4d (diff) | |
| download | hdf5-25df1908bc0430994cecc9f1415838f42fe0c816.zip hdf5-25df1908bc0430994cecc9f1415838f42fe0c816.tar.gz hdf5-25df1908bc0430994cecc9f1415838f42fe0c816.tar.bz2 | |
[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.
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/reconfigure | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/bin/reconfigure b/bin/reconfigure index c739172..80b8268 100755 --- a/bin/reconfigure +++ b/bin/reconfigure @@ -12,19 +12,28 @@ # and this machine has the right version of m4, this script should # be able to run the autotools. +# Add the correct version of autoconf binaries to path (otherwise aclocal +# may find an outdated version of autom4ate and complain about an +# "unknown language": Autoconf-without-aclocal-m4. +PATH=/afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin:$PATH # Run commands in order - echo /afs/ncsa/projects/hdf/packages/automake_1.6.3/Linux_2.4/bin/aclocal -I /afs/ncsa/projects/hdf/packages/libtool_1.5.14/Linux_2.4/share/aclocal - /afs/ncsa/projects/hdf/packages/automake_1.6.3/Linux_2.4/bin/aclocal -I /afs/ncsa/projects/hdf/packages/libtool_1.5.14/Linux_2.4/share/aclocal + echo /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/aclocal-1.9 -I /afs/ncsa/projects/hdf/packages/libtool_1.5.14/Linux_2.4/share/aclocal + /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/aclocal-1.9 -I /afs/ncsa/projects/hdf/packages/libtool_1.5.14/Linux_2.4/share/aclocal echo /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoheader /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoheader - echo /afs/ncsa/projects/hdf/packages/automake_1.6.3/Linux_2.4/bin/automake --foreign - /afs/ncsa/projects/hdf/packages/automake_1.6.3/Linux_2.4/bin/automake --foreign + echo /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/automake-1.9 --foreign + /afs/ncsa/projects/hdf/packages/automake_1.9.5/Linux_2.4/bin/automake-1.9 --foreign echo /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoconf /afs/ncsa/projects/hdf/packages/autoconf_2.59/Linux_2.4/bin/autoconf + # Clean up Makefiles.in + # Right now, only the root-level Makefile.in is edited to allow configure + # to pass arguments to the .MAKEFLAGS target to pacify pmake. + sed "s/^#xxx//" Makefile.in > Makefile.in.new + mv Makefile.in.new Makefile.in exit 0 |