From feab08a0eeb4ac38c38b12fc0f43a15540d22cee Mon Sep 17 00:00:00 2001 From: Albert Cheng Date: Sun, 18 May 2008 21:25:13 -0500 Subject: [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.) --- Makefile.in | 15 +++ c++/Makefile.in | 15 +++ c++/examples/Makefile.in | 20 +++- c++/src/Makefile.in | 20 +++- c++/test/Makefile.in | 20 +++- configure | 217 +++++++++++++++++++++++++++++----------- configure.in | 63 +++++++++++- examples/Makefile.in | 15 +++ fortran/Makefile.in | 15 +++ fortran/examples/Makefile.in | 20 +++- fortran/src/Makefile.in | 20 +++- fortran/test/Makefile.in | 22 +++- fortran/testpar/Makefile.in | 20 +++- hl/Makefile.in | 15 +++ hl/c++/Makefile.in | 15 +++ hl/c++/examples/Makefile.in | 20 +++- hl/c++/src/Makefile.in | 15 +++ hl/c++/test/Makefile.in | 15 +++ hl/examples/Makefile.in | 15 +++ hl/fortran/Makefile.in | 15 +++ hl/fortran/examples/Makefile.in | 20 +++- hl/fortran/src/Makefile.in | 15 +++ hl/fortran/test/Makefile.in | 15 +++ hl/src/Makefile.in | 15 +++ hl/test/Makefile.in | 15 +++ hl/tools/Makefile.in | 15 +++ hl/tools/gif2h5/Makefile.in | 15 +++ perform/Makefile.in | 15 +++ src/Makefile.in | 15 +++ src/libhdf5.settings.in | 80 +++++++++++---- test/Makefile.in | 15 +++ testpar/Makefile.in | 15 +++ tools/Makefile.in | 15 +++ tools/h5copy/Makefile.in | 15 +++ tools/h5diff/Makefile.in | 15 +++ tools/h5dump/Makefile.in | 15 +++ tools/h5import/Makefile.in | 15 +++ tools/h5jam/Makefile.in | 15 +++ tools/h5ls/Makefile.in | 15 +++ tools/h5repack/Makefile.in | 15 +++ tools/h5stat/Makefile.in | 15 +++ tools/lib/Makefile.in | 15 +++ tools/misc/Makefile.in | 15 +++ 43 files changed, 899 insertions(+), 108 deletions(-) diff --git a/Makefile.in b/Makefile.in index 6622e25..9c443b6 100644 --- a/Makefile.in +++ b/Makefile.in @@ -124,6 +124,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@ @@ -139,6 +140,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@ @@ -147,6 +149,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@ @@ -159,6 +162,7 @@ FCLIBS = @FCLIBS@ FGREP = @FGREP@ FILTERS = @FILTERS@ FSEARCH_DIRS = @FSEARCH_DIRS@ +GPFS = @GPFS@ GREP = @GREP@ H5_CFLAGS = @H5_CFLAGS@ H5_CPPFLAGS = @H5_CPPFLAGS@ @@ -167,7 +171,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@ @@ -178,12 +186,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@ @@ -223,13 +233,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@ @@ -262,6 +275,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@ diff --git a/c++/Makefile.in b/c++/Makefile.in index c808bb3..3d4ceb3 100644 --- a/c++/Makefile.in +++ b/c++/Makefile.in @@ -95,6 +95,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@ @@ -110,6 +111,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@ @@ -118,6 +120,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@ @@ -130,6 +133,7 @@ FCLIBS = @FCLIBS@ FGREP = @FGREP@ FILTERS = @FILTERS@ FSEARCH_DIRS = @FSEARCH_DIRS@ +GPFS = @GPFS@ GREP = @GREP@ H5_CFLAGS = @H5_CFLAGS@ H5_CPPFLAGS = @H5_CPPFLAGS@ @@ -138,7 +142,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@ @@ -149,12 +157,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@ @@ -194,13 +204,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@ @@ -233,6 +246,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@ diff --git a/c++/examples/Makefile.in b/c++/examples/Makefile.in index d20abba..d7cb7c2 100644 --- a/c++/examples/Makefile.in +++ b/c++/examples/Makefile.in @@ -89,6 +89,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@ @@ -104,6 +105,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@ @@ -112,6 +114,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@ @@ -124,6 +127,7 @@ FCLIBS = @FCLIBS@ FGREP = @FGREP@ FILTERS = @FILTERS@ FSEARCH_DIRS = @FSEARCH_DIRS@ +GPFS = @GPFS@ GREP = @GREP@ H5_CFLAGS = @H5_CFLAGS@ H5_CPPFLAGS = @H5_CPPFLAGS@ @@ -132,7 +136,13 @@ 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@ + +# Tell conclude.am that these are C++ tests. +HDF_CXX = yes +HDF_FORTRAN = @HDF_FORTRAN@ HID_T = @HID_T@ HL = @HL@ HL_FOR = @HL_FOR@ @@ -143,12 +153,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@ @@ -188,13 +200,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@ @@ -227,6 +242,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@ @@ -311,9 +328,6 @@ INSTALL_FILES = create.cpp readdata.cpp writedata.cpp compound.cpp \ extend_ds.cpp chunks.cpp h5group.cpp -# Tell conclude.am that these are C++ tests. -HDF_CXX = yes - # Where to install examples EXAMPLEDIR = $(docdir)/hdf5/examples/c++ diff --git a/c++/src/Makefile.in b/c++/src/Makefile.in index 3d898cb..e9836e9 100644 --- a/c++/src/Makefile.in +++ b/c++/src/Makefile.in @@ -125,6 +125,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@ @@ -140,6 +141,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@ @@ -148,6 +150,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@ @@ -160,6 +163,7 @@ FCLIBS = @FCLIBS@ FGREP = @FGREP@ FILTERS = @FILTERS@ FSEARCH_DIRS = @FSEARCH_DIRS@ +GPFS = @GPFS@ GREP = @GREP@ H5_CFLAGS = @H5_CFLAGS@ H5_CPPFLAGS = @H5_CPPFLAGS@ @@ -168,7 +172,13 @@ 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@ + +# Mark this directory as part of the C++ API +HDF_CXX = yes +HDF_FORTRAN = @HDF_FORTRAN@ HID_T = @HID_T@ HL = @HL@ HL_FOR = @HL_FOR@ @@ -179,12 +189,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@ @@ -224,13 +236,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@ @@ -263,6 +278,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@ @@ -370,9 +387,6 @@ include_HEADERS = H5Cpp.h H5AbstractDs.h H5AtomType.h H5Attribute.h H5Classes.h # distclean. DISTCLEANFILES = h5c++ libhdf5.settings -# Mark this directory as part of the C++ API -HDF_CXX = yes - # Automake needs to be taught how to build lib, progs, and tests targets. # These will be filled in automatically for the most part (e.g., # lib_LIBRARIES are built for lib target), but EXTRA_LIB, EXTRA_PROG, and diff --git a/c++/test/Makefile.in b/c++/test/Makefile.in index 2736dae..9432b9a 100644 --- a/c++/test/Makefile.in +++ b/c++/test/Makefile.in @@ -111,6 +111,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@ @@ -126,6 +127,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@ @@ -134,6 +136,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@ @@ -146,6 +149,7 @@ FCLIBS = @FCLIBS@ FGREP = @FGREP@ FILTERS = @FILTERS@ FSEARCH_DIRS = @FSEARCH_DIRS@ +GPFS = @GPFS@ GREP = @GREP@ H5_CFLAGS = @H5_CFLAGS@ H5_CPPFLAGS = @H5_CPPFLAGS@ @@ -154,7 +158,13 @@ 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@ + +# Tell conclude.am that these are C++ tests. +HDF_CXX = yes +HDF_FORTRAN = @HDF_FORTRAN@ HID_T = @HID_T@ HL = @HL@ HL_FOR = @HL_FOR@ @@ -165,12 +175,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@ @@ -210,13 +222,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@ @@ -249,6 +264,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@ @@ -340,9 +357,6 @@ testhdf5_SOURCES = testhdf5.cpp tattr.cpp tcompound.cpp tfile.cpp tfilter.cpp \ th5s.cpp trefer.cpp ttypes.cpp tvlstr.cpp h5cpputil.cpp -# Tell conclude.am that these are C++ tests. -HDF_CXX = yes - # Automake needs to be taught how to build lib, progs, and tests targets. # These will be filled in automatically for the most part (e.g., # lib_LIBRARIES are built for lib target), but EXTRA_LIB, EXTRA_PROG, and diff --git a/configure b/configure index bda3b01..f00b9f9 100755 --- a/configure +++ b/configure @@ -841,6 +841,25 @@ H5_CFLAGS H5_CPPFLAGS H5_FCFLAGS H5_CXXFLAGS +EXTERNAL_FILTERS +MPE +STATIC_EXEC +HDF_FORTRAN +FC +HDF_CXX +CXX +HDF5_HL +GPFS +LINUX_LFS +INSTRUMENT +CODESTACK +HAVE_DMALLOC +DIRECT_VFD +THREADSAFE +STATIC_SHARED +enable_shared +enable_static +UNAME_INFO CC CFLAGS LDFLAGS @@ -865,7 +884,6 @@ HSSIZE_T HID_T SIZE_T OBJECT_NAMELEN_DEFAULT_F -FC FCFLAGS ac_ct_FC FCFLAGS_f90 @@ -874,7 +892,6 @@ FSEARCH_DIRS F9XMODFLAG F9XMODEXT FCLIBS -CXX CXXFLAGS ac_ct_CXX CXXDEPMODE @@ -920,7 +937,6 @@ INSTRUMENT_LIBRARY CLEARFILEBUF USINGMEMCHECKER ADD_PARALLEL_FILES -MPE MPI_GET_SIZE FILTERS USE_FILTER_SHUFFLE @@ -955,8 +971,7 @@ BUILD_HDF5_HL_CONDITIONAL_FALSE SEARCH SETX LIBOBJS -LTLIBOBJS -STATIC_SHARED' +LTLIBOBJS' ac_subst_files='' ac_precious_vars='build_alias host_alias @@ -2726,6 +2741,27 @@ echo "${ECHO_T}done" >&6; } + MPE=no + STATIC_EXEC=no + HDF_FORTRAN=no + HDF_FORTRAN=no + HDF_CXX=no + HDF_CXX=no + HDF5_HL=yes + GPFS=no + LINUX_LFS=no + + CODESTACK=no + HAVE_DMALLOC=no + DIRECT_VFD=no + THREADSAFE=no + + + + UNAME_INFO=`uname -a` + + + { echo "$as_me:$LINENO: checking if basename works" >&5 echo $ECHO_N "checking if basename works... $ECHO_C" >&6; } BASENAME_TEST="`basename /foo/bar/baz/qux/basename_works`" @@ -7876,13 +7912,13 @@ if test "${lt_cv_nm_interface+set}" = set; then else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:7879: $ac_compile\"" >&5) + (eval echo "\"\$as_me:7915: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:7882: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:7918: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:7885: output\"" >&5) + (eval echo "\"\$as_me:7921: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -8990,7 +9026,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 8993 "configure"' > conftest.$ac_ext + echo '#line 9029 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -11559,11 +11595,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11562: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11598: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:11566: \$? = $ac_status" >&5 + echo "$as_me:11602: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -11883,11 +11919,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11886: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11922: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:11890: \$? = $ac_status" >&5 + echo "$as_me:11926: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -11988,11 +12024,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11991: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12027: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:11995: \$? = $ac_status" >&5 + echo "$as_me:12031: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -12043,11 +12079,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12046: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12082: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12050: \$? = $ac_status" >&5 + echo "$as_me:12086: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -14871,7 +14907,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 14874 "configure" +#line 14910 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -14971,7 +15007,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 14974 "configure" +#line 15010 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -16990,11 +17026,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16993: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17029: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16997: \$? = $ac_status" >&5 + echo "$as_me:17033: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -17089,11 +17125,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17092: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17128: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:17096: \$? = $ac_status" >&5 + echo "$as_me:17132: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -17141,11 +17177,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:17144: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17180: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:17148: \$? = $ac_status" >&5 + echo "$as_me:17184: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -18671,11 +18707,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:18674: $lt_compile\"" >&5) + (eval echo "\"\$as_me:18710: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:18678: \$? = $ac_status" >&5 + echo "$as_me:18714: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -18770,11 +18806,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:18773: $lt_compile\"" >&5) + (eval echo "\"\$as_me:18809: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:18777: \$? = $ac_status" >&5 + echo "$as_me:18813: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -18822,11 +18858,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:18825: $lt_compile\"" >&5) + (eval echo "\"\$as_me:18861: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:18829: \$? = $ac_status" >&5 + echo "$as_me:18865: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -47753,7 +47789,7 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ conftest$ac_exeext conftest.$ac_ext fi - MPE=yes + MPE=yes # Check whether --with-mpe was given. if test "${with_mpe+set}" = set; then @@ -51880,28 +51916,28 @@ H5_CFLAGS!$H5_CFLAGS$ac_delim H5_CPPFLAGS!$H5_CPPFLAGS$ac_delim H5_FCFLAGS!$H5_FCFLAGS$ac_delim H5_CXXFLAGS!$H5_CXXFLAGS$ac_delim +EXTERNAL_FILTERS!$EXTERNAL_FILTERS$ac_delim +MPE!$MPE$ac_delim +STATIC_EXEC!$STATIC_EXEC$ac_delim +HDF_FORTRAN!$HDF_FORTRAN$ac_delim +FC!$FC$ac_delim +HDF_CXX!$HDF_CXX$ac_delim +CXX!$CXX$ac_delim +HDF5_HL!$HDF5_HL$ac_delim +GPFS!$GPFS$ac_delim +LINUX_LFS!$LINUX_LFS$ac_delim +INSTRUMENT!$INSTRUMENT$ac_delim +CODESTACK!$CODESTACK$ac_delim +HAVE_DMALLOC!$HAVE_DMALLOC$ac_delim +DIRECT_VFD!$DIRECT_VFD$ac_delim +THREADSAFE!$THREADSAFE$ac_delim +STATIC_SHARED!$STATIC_SHARED$ac_delim +enable_shared!$enable_shared$ac_delim +enable_static!$enable_static$ac_delim +UNAME_INFO!$UNAME_INFO$ac_delim CC!$CC$ac_delim CFLAGS!$CFLAGS$ac_delim LDFLAGS!$LDFLAGS$ac_delim -ac_ct_CC!$ac_ct_CC$ac_delim -EXEEXT!$EXEEXT$ac_delim -OBJEXT!$OBJEXT$ac_delim -DEPDIR!$DEPDIR$ac_delim -am__include!$am__include$ac_delim -am__quote!$am__quote$ac_delim -AMDEP_TRUE!$AMDEP_TRUE$ac_delim -AMDEP_FALSE!$AMDEP_FALSE$ac_delim -AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim -CCDEPMODE!$CCDEPMODE$ac_delim -am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim -am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim -HDF5_INTERFACES!$HDF5_INTERFACES$ac_delim -R_LARGE!$R_LARGE$ac_delim -R_INTEGER!$R_INTEGER$ac_delim -HADDR_T!$HADDR_T$ac_delim -HSIZE_T!$HSIZE_T$ac_delim -HSSIZE_T!$HSSIZE_T$ac_delim -HID_T!$HID_T$ac_delim _ACEOF if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then @@ -51943,9 +51979,27 @@ _ACEOF ac_delim='%!_!# ' for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF +ac_ct_CC!$ac_ct_CC$ac_delim +EXEEXT!$EXEEXT$ac_delim +OBJEXT!$OBJEXT$ac_delim +DEPDIR!$DEPDIR$ac_delim +am__include!$am__include$ac_delim +am__quote!$am__quote$ac_delim +AMDEP_TRUE!$AMDEP_TRUE$ac_delim +AMDEP_FALSE!$AMDEP_FALSE$ac_delim +AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim +CCDEPMODE!$CCDEPMODE$ac_delim +am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim +am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim +HDF5_INTERFACES!$HDF5_INTERFACES$ac_delim +R_LARGE!$R_LARGE$ac_delim +R_INTEGER!$R_INTEGER$ac_delim +HADDR_T!$HADDR_T$ac_delim +HSIZE_T!$HSIZE_T$ac_delim +HSSIZE_T!$HSSIZE_T$ac_delim +HID_T!$HID_T$ac_delim SIZE_T!$SIZE_T$ac_delim OBJECT_NAMELEN_DEFAULT_F!$OBJECT_NAMELEN_DEFAULT_F$ac_delim -FC!$FC$ac_delim FCFLAGS!$FCFLAGS$ac_delim ac_ct_FC!$ac_ct_FC$ac_delim FCFLAGS_f90!$FCFLAGS_f90$ac_delim @@ -51954,7 +52008,6 @@ FSEARCH_DIRS!$FSEARCH_DIRS$ac_delim F9XMODFLAG!$F9XMODFLAG$ac_delim F9XMODEXT!$F9XMODEXT$ac_delim FCLIBS!$FCLIBS$ac_delim -CXX!$CXX$ac_delim CXXFLAGS!$CXXFLAGS$ac_delim ac_ct_CXX!$ac_ct_CXX$ac_delim CXXDEPMODE!$CXXDEPMODE$ac_delim @@ -52000,7 +52053,6 @@ INSTRUMENT_LIBRARY!$INSTRUMENT_LIBRARY$ac_delim CLEARFILEBUF!$CLEARFILEBUF$ac_delim USINGMEMCHECKER!$USINGMEMCHECKER$ac_delim ADD_PARALLEL_FILES!$ADD_PARALLEL_FILES$ac_delim -MPE!$MPE$ac_delim MPI_GET_SIZE!$MPI_GET_SIZE$ac_delim FILTERS!$FILTERS$ac_delim USE_FILTER_SHUFFLE!$USE_FILTER_SHUFFLE$ac_delim @@ -52024,6 +52076,47 @@ BUILD_ALL_CONDITIONAL_FALSE!$BUILD_ALL_CONDITIONAL_FALSE$ac_delim DEPRECATED_SYMBOLS!$DEPRECATED_SYMBOLS$ac_delim DEFAULT_API_VERSION!$DEFAULT_API_VERSION$ac_delim STRICT_FORMAT_CHECKS!$STRICT_FORMAT_CHECKS$ac_delim +_ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} + { (exit 1); exit 1; }; } + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +done + +ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` +if test -n "$ac_eof"; then + ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` + ac_eof=`expr $ac_eof + 1` +fi + +cat >>$CONFIG_STATUS <<_ACEOF +cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b +_ACEOF +sed ' +s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g +s/^/s,@/; s/!/@,|#_!!_#|/ +:n +t n +s/'"$ac_delim"'$/,g/; t +s/$/\\/; p +N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n +' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF +CEOF$ac_eof +_ACEOF + + +ac_delim='%!_!# ' +for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF BUILD_CXX_CONDITIONAL_TRUE!$BUILD_CXX_CONDITIONAL_TRUE$ac_delim BUILD_CXX_CONDITIONAL_FALSE!$BUILD_CXX_CONDITIONAL_FALSE$ac_delim BUILD_PARALLEL_CONDITIONAL_TRUE!$BUILD_PARALLEL_CONDITIONAL_TRUE$ac_delim @@ -52038,7 +52131,7 @@ LIBOBJS!$LIBOBJS$ac_delim LTLIBOBJS!$LTLIBOBJS$ac_delim _ACEOF - if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 93; then + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 12; then break elif $ac_last_try; then { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 @@ -52056,7 +52149,7 @@ if test -n "$ac_eof"; then fi cat >>$CONFIG_STATUS <<_ACEOF -cat >"\$tmp/subs-2.sed" <<\CEOF$ac_eof +cat >"\$tmp/subs-3.sed" <<\CEOF$ac_eof /@[a-zA-Z_][a-zA-Z_0-9]*@/!b end _ACEOF sed ' @@ -52325,7 +52418,7 @@ s&@abs_top_builddir@&$ac_abs_top_builddir&;t t s&@INSTALL@&$ac_INSTALL&;t t s&@MKDIR_P@&$ac_MKDIR_P&;t t $ac_datarootdir_hack -" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" >$tmp/out +" $ac_file_inputs | sed -f "$tmp/subs-1.sed" | sed -f "$tmp/subs-2.sed" | sed -f "$tmp/subs-3.sed" >$tmp/out test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && @@ -52493,6 +52586,10 @@ echo "$as_me: executing $ac_file commands" >&6;} else /bin/mv -f pubconf src/H5pubconf.h fi + echo "Post process src/libhdf5.settings" + sed '/^#/d' < src/libhdf5.settings > libhdf5.settings.TMP + cp libhdf5.settings.TMP src/libhdf5.settings + rm -f libhdf5.settings.TMP ;; "depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do # Strip MF so we end up with the name of the file. @@ -53581,7 +53678,6 @@ touch ./config/stamp2 # Finally the makefiles test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1 - if (./libtool --features | grep '^enable shared libraries' > /dev/null); then enable_shared=yes else @@ -53621,6 +53717,9 @@ cat >> src/H5config.h </dev/null; then if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then @@ -53816,4 +53915,4 @@ IF_ENABLED_DISABLED "$THREADSAFE" PRINT_N " High Level library" IF_ENABLED_DISABLED "$HDF5_HL" - +fi diff --git a/configure.in b/configure.in index 6a40a77..23674b1 100644 --- a/configure.in +++ b/configure.in @@ -48,6 +48,14 @@ dnl Developers should './configure --enable-maintainer-mode' to turn on dnl rebuild rules. AM_MAINTAINER_MODE +dnl Run post processing on files created by configure. +dnl src/H5pubconf.h: +dnl Generate src/H5pubconf.h from src/H5config.h by prepending H5_ to all +dnl macro names. This avoid name conflict between HDF5 macro names and those +dnl generated by another software package that uses the HDF5 library. +dnl src/libhdf5.settings: +dnl Remove all lines begun with "#" which are generated by CONDITIONAL's of +dnl configure. AC_OUTPUT_COMMANDS([ echo "creating src/H5pubconf.h" sed 's/#define /#define H5_/' libhdf5.settings.TMP + cp libhdf5.settings.TMP src/libhdf5.settings + rm -f libhdf5.settings.TMP ]) dnl It's possible to configure for a host other than the one on which @@ -112,6 +124,47 @@ AC_MSG_CHECKING([shell variables initial values]) set >&AS_MESSAGE_LOG_FD AC_MSG_RESULT([done]) +dnl Define all symbol variables used for configure summary. +dnl EXTERNAL_FILTERS equals all external filters. Default none. +dnl MPE: whether MPE option is enabled. Default no. +dnl STATIC_EXEC: whether static-exec is enabled. Default no. +dnl HDF_FORTRAN: whether Fortran is enabled. Default no. +dnl FC: Fortran compiler. +dnl HDF_CXX: whether C++ is enabled. Default no. +dnl CXX: C++ compiler. +dnl HDF5_HL: whether high-level library is enabled. Default is yes. +dnl GPFS: whether gpfs is enabled. Default no. +dnl LINUX_LFS: whether LINUX_LFS is enabled. Default no. +dnl INSTRUMENT: whether INSTRUMENT is enabled. No default set here. +dnl CODESTACK: whether CODESTACK is enabled. Default no. +dnl HAVE_DMALLOC: whether system has dmalloc support. Default no. +dnl DIRECT_VFD: whether DIRECT_VFD is enabled. Default no. +dnl THREADSAFE: whether THREADSAFE is enabled. Default no. +dnl STATIC_SHARED: whether static and/or shared libraries are requested. +dnl enable_shared: whether shared lib is enabled. +dnl enable_static: whether static lib is enabled. +dnl UNAME_INFO: System information. + +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) +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` + dnl ---------------------------------------------------------------------- dnl Some platforms have broken basename, and/or xargs programs. Check dnl that it actually does what it's supposed to do. Catch this early @@ -2465,7 +2518,7 @@ if test -n "$PARALLEL"; then dnl This must be done after enable-parallel is checked since it depends dnl on a mpich compiler. dnl - AC_SUBST([MPE]) MPE=yes + MPE=yes AC_ARG_WITH([mpe], [AC_HELP_STRING([--with-mpe=DIR], [Use MPE instrumentation [default=no]])],, @@ -3833,7 +3886,6 @@ dnl $enable_static and $enable_shared because if they're yes the ltconfig dnl might have decided that one or the other is simply not possible. dnl Therefore we have to ask the generated `libtool' shell script dnl which 'features' it has enabled. -AC_SUBST([STATIC_SHARED]) if (./libtool --features | grep '^enable shared libraries' > /dev/null); then enable_shared=yes else @@ -3876,6 +3928,11 @@ cat >> src/H5config.h <