diff options
| author | Mike McGreevy <mamcgree@hdfgroup.org> | 2011-04-15 20:41:32 (GMT) |
|---|---|---|
| committer | Mike McGreevy <mamcgree@hdfgroup.org> | 2011-04-15 20:41:32 (GMT) |
| commit | 699098014b590a5e39df37d92e7d36139741fd0c (patch) | |
| tree | 718ccce06ac3dde4c295e8d325bcc28baf8ed537 /config | |
| parent | e59c147f5d647e1fdec51a96fc5ebe8754c2c73f (diff) | |
| download | hdf5-699098014b590a5e39df37d92e7d36139741fd0c.zip hdf5-699098014b590a5e39df37d92e7d36139741fd0c.tar.gz hdf5-699098014b590a5e39df37d92e7d36139741fd0c.tar.bz2 | |
[svn-r20525] Description:
Merge revisions 20475, 20502, and 20504 from trunk to 1.8 branch.
Tested:
Tested on jam, fred, bangan (CYGWIN), and h5committested.
Diffstat (limited to 'config')
| -rw-r--r-- | config/apple | 8 | ||||
| -rw-r--r-- | config/commence.am | 2 |
2 files changed, 2 insertions, 8 deletions
diff --git a/config/apple b/config/apple index babcdad..a2d6ae4 100644 --- a/config/apple +++ b/config/apple @@ -47,14 +47,6 @@ fi . $srcdir/config/intel-fflags -# Fortran doesn't work with shared libraries -# -if test "X-" != "X-$enable_fortran"; then - echo ' Warning: shared libraries are not supported with Fortran' - echo ' Disabling shared libraries' - enable_shared="no" -fi - # compiler version strings case $CC in *gcc*) diff --git a/config/commence.am b/config/commence.am index c5c27d5..3d098d9 100644 --- a/config/commence.am +++ b/config/commence.am @@ -69,11 +69,13 @@ H5CPP=${DESTDIR}$(bindir)/h5c++ # but which should not be exported to h5cc for building other programs. # AM_CFLAGS is an automake construct which should be used by Makefiles # instead of CFLAGS, as CFLAGS is reserved solely for the user to define. +# This applies to FCFLAGS, CXXFLAGS, CPPFLAGS, and LDFLAGS as well. AM_CFLAGS=@AM_CFLAGS@ @H5_CFLAGS@ AM_FCFLAGS=@AM_FCFLAGS@ @H5_FCFLAGS@ AM_CXXFLAGS=@AM_CXXFLAGS@ @H5_CXXFLAGS@ AM_CPPFLAGS=@AM_CPPFLAGS@ @H5_CPPFLAGS@ +AM_LDFLAGS=@AM_LDFLAGS@ @H5_LDFLAGS@ ACLOCAL_AMFLAGS="-I m4" |