summaryrefslogtreecommitdiffstats
path: root/tools/h5ls
diff options
context:
space:
mode:
authorAlbert Cheng <acheng@hdfgroup.org>2008-05-19 02:25:13 (GMT)
committerAlbert Cheng <acheng@hdfgroup.org>2008-05-19 02:25:13 (GMT)
commitfeab08a0eeb4ac38c38b12fc0f43a15540d22cee (patch)
treeac1b666a2519c5c70041f26ec1b53268dbd0712b /tools/h5ls
parentf0b8da5851403d97baa7e0791e9f28e7a294b91e (diff)
downloadhdf5-feab08a0eeb4ac38c38b12fc0f43a15540d22cee.zip
hdf5-feab08a0eeb4ac38c38b12fc0f43a15540d22cee.tar.gz
hdf5-feab08a0eeb4ac38c38b12fc0f43a15540d22cee.tar.bz2
[svn-r15033] Purpose:
Improvement. Description: src/libhdf5.settings was the initial configure summary and is installed. Then configure is changed to dump a summary of the configure settings to the output and also append it to src/libhdf5.settings. That created two different output formats and duplicated information. This is the initial attempt to clean up this confusion and unify the output format. It is decided to use the src/libhdf5.settings template as the unified means. This requires more macros symbols be defined. The following symbols are all related to generating the src/libhdf5.settings file. AC_SUBST(EXTERNAL_FILTERS) AC_SUBST(MPE) MPE=no AC_SUBST(STATIC_EXEC) STATIC_EXEC=no AC_SUBST(HDF_FORTRAN) HDF_FORTRAN=no AC_SUBST(FC) HDF_FORTRAN=no AC_SUBST(HDF_CXX) HDF_CXX=no AC_SUBST(CXX) HDF_CXX=no AC_SUBST(HDF5_HL) HDF5_HL=yes AC_SUBST(GPFS) GPFS=no AC_SUBST(LINUX_LFS) LINUX_LFS=no AC_SUBST(INSTRUMENT) INSTRUMENT=no AC_SUBST(CODESTACK) CODESTACK=no AC_SUBST(HAVE_DMALLOC) HAVE_DMALLOC=no AC_SUBST(DIRECT_VFD) DIRECT_VFD=no AC_SUBST(THREADSAFE) THREADSAFE=no AC_SUBST(STATIC_SHARED) AC_SUBST(enable_shared) AC_SUBST(enable_static) AC_SUBST(UNAME_INFO) UNAME_INFO=`uname -a` The src/libhdf5.settings.in has CONDITIONAL's added to it too. The untrue conditions turned into a "#" and these lines are cleaned by the post processing script. Platform tested: h5committest on kagiso, smirom and linew. (smirom had failures not due to my changes.)
Diffstat (limited to 'tools/h5ls')
-rw-r--r--tools/h5ls/Makefile.in15
1 files changed, 15 insertions, 0 deletions
diff --git a/tools/h5ls/Makefile.in b/tools/h5ls/Makefile.in
index a4dba4e..1f3f11a 100644
--- a/tools/h5ls/Makefile.in
+++ b/tools/h5ls/Makefile.in
@@ -107,6 +107,7 @@ CC_VERSION = @CC_VERSION@
# but which shouldn't be exported to h5cc for building other programs.
CFLAGS = @CFLAGS@ @H5_CFLAGS@
CLEARFILEBUF = @CLEARFILEBUF@
+CODESTACK = @CODESTACK@
CONFIG_DATE = @CONFIG_DATE@
CONFIG_MODE = @CONFIG_MODE@
CONFIG_USER = @CONFIG_USER@
@@ -122,6 +123,7 @@ DEFAULT_API_VERSION = @DEFAULT_API_VERSION@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DEPRECATED_SYMBOLS = @DEPRECATED_SYMBOLS@
+DIRECT_VFD = @DIRECT_VFD@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
DYNAMIC_DIRS = @DYNAMIC_DIRS@
@@ -130,6 +132,7 @@ ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
EXEEXT = @EXEEXT@
+EXTERNAL_FILTERS = @EXTERNAL_FILTERS@
# Make sure that these variables are exported to the Makefiles
F9XMODEXT = @F9XMODEXT@
@@ -142,6 +145,7 @@ FCLIBS = @FCLIBS@
FGREP = @FGREP@
FILTERS = @FILTERS@
FSEARCH_DIRS = @FSEARCH_DIRS@
+GPFS = @GPFS@
GREP = @GREP@
H5_CFLAGS = @H5_CFLAGS@
H5_CPPFLAGS = @H5_CPPFLAGS@
@@ -150,7 +154,11 @@ H5_FCFLAGS = @H5_FCFLAGS@
H5_LONE_COLON = @H5_LONE_COLON@
H5_VERSION = @H5_VERSION@
HADDR_T = @HADDR_T@
+HAVE_DMALLOC = @HAVE_DMALLOC@
+HDF5_HL = @HDF5_HL@
HDF5_INTERFACES = @HDF5_INTERFACES@
+HDF_CXX = @HDF_CXX@
+HDF_FORTRAN = @HDF_FORTRAN@
HID_T = @HID_T@
HL = @HL@
HL_FOR = @HL_FOR@
@@ -161,12 +169,14 @@ INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTRUMENT = @INSTRUMENT@
INSTRUMENT_LIBRARY = @INSTRUMENT_LIBRARY@
LD = @LD@
LDFLAGS = @LDFLAGS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
+LINUX_LFS = @LINUX_LFS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
LT_STATIC_EXEC = @LT_STATIC_EXEC@
@@ -206,13 +216,16 @@ SET_MAKE = @SET_MAKE@
# configure's automatic SHELL detection may not work on the build machine.
SHELL = /bin/sh
SIZE_T = @SIZE_T@
+STATIC_EXEC = @STATIC_EXEC@
STATIC_SHARED = @STATIC_SHARED@
STRICT_FORMAT_CHECKS = @STRICT_FORMAT_CHECKS@
STRIP = @STRIP@
TESTPARALLEL = @TESTPARALLEL@
+THREADSAFE = @THREADSAFE@
TIME = @TIME@
TR = @TR@
TRACE_API = @TRACE_API@
+UNAME_INFO = @UNAME_INFO@
USE_FILTER_DEFLATE = @USE_FILTER_DEFLATE@
USE_FILTER_FLETCHER32 = @USE_FILTER_FLETCHER32@
USE_FILTER_NBIT = @USE_FILTER_NBIT@
@@ -245,6 +258,8 @@ datadir = @datadir@
datarootdir = @datarootdir@
docdir = $(exec_prefix)/doc
dvidir = @dvidir@
+enable_shared = @enable_shared@
+enable_static = @enable_static@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@