summaryrefslogtreecommitdiffstats
path: root/hl/tools/gif2h5/Makefile.in
diff options
context:
space:
mode:
authorMike McGreevy <mamcgree@hdfgroup.org>2011-04-11 21:00:38 (GMT)
committerMike McGreevy <mamcgree@hdfgroup.org>2011-04-11 21:00:38 (GMT)
commite006157deb5866bf45ca0f092d42b7f9969e4209 (patch)
tree3e5e3db5969ab9cff933088a3a54b2f1df1435bb /hl/tools/gif2h5/Makefile.in
parenta835d1e65a3dbae4feca742db93d0b2e1a9ff29c (diff)
downloadhdf5-e006157deb5866bf45ca0f092d42b7f9969e4209.zip
hdf5-e006157deb5866bf45ca0f092d42b7f9969e4209.tar.gz
hdf5-e006157deb5866bf45ca0f092d42b7f9969e4209.tar.bz2
[svn-r20475] Purpose:
- Revise shared Fortran library disabling scenarios in configure - Improve configure output summary Description: Shared Fortran libraries are not supported on Mac, but were being disabled by configure in a way that also forced the C libraries to be static-only. This has been fixed, so now only shared Fortran is disabled while shared C can remain. This prompted two additional changes: 1. While working on the check that addresses whether or not shared Fortran libraries are allowed, removed old and no longer needed check(s) that disable shared Fortran libraries with HP, Intel 8, PGI, and Absoft compilers. (Essentially, Mac is the only situation in which Fortran shared are disabled by configure.) 2. Having two different states of libraries (i.e. shared C library with static-only Fortran library) was not apparent in the configure summary, which labeled all libraries as either shared and/or static. I've added lines to both the C++ and Fortran output sections to list shared/static-ness of these libraries specifically. Additionally, I've made sure that the new --enable-unsupported configure option correctly overrides configure if it tries to disable a shared library. Tested: jam, fred, & h5committest
Diffstat (limited to 'hl/tools/gif2h5/Makefile.in')
-rw-r--r--hl/tools/gif2h5/Makefile.in2
1 files changed, 2 insertions, 0 deletions
diff --git a/hl/tools/gif2h5/Makefile.in b/hl/tools/gif2h5/Makefile.in
index 3b6d2da..3be9652 100644
--- a/hl/tools/gif2h5/Makefile.in
+++ b/hl/tools/gif2h5/Makefile.in
@@ -182,7 +182,9 @@ GREP = @GREP@
H5_CFLAGS = @H5_CFLAGS@
H5_CPPFLAGS = @H5_CPPFLAGS@
H5_CXXFLAGS = @H5_CXXFLAGS@
+H5_CXX_SHARED = @H5_CXX_SHARED@
H5_FCFLAGS = @H5_FCFLAGS@
+H5_FORTRAN_SHARED = @H5_FORTRAN_SHARED@
H5_LONE_COLON = @H5_LONE_COLON@
H5_VERSION = @H5_VERSION@
HADDR_T = @HADDR_T@