diff options
| author | Larry Knox <lrknox@hdfgroup.org> | 2022-07-29 21:00:28 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-29 21:00:28 (GMT) |
| commit | f9b6967afaf5b89177ec8ee610723aa714dfb27e (patch) | |
| tree | 7a7e71c3c30a35bb44c65d7e78a41616ff21129f | |
| parent | 6e92521311713123a6b2ab3b0a25f1b138f16e27 (diff) | |
| download | hdf5-f9b6967afaf5b89177ec8ee610723aa714dfb27e.zip hdf5-f9b6967afaf5b89177ec8ee610723aa714dfb27e.tar.gz hdf5-f9b6967afaf5b89177ec8ee610723aa714dfb27e.tar.bz2 | |
Run bin/reconfigure to propagate fortran mod change to configure and (#1952)
Makefile.in files.
44 files changed, 118 insertions, 29 deletions
diff --git a/Makefile.in b/Makefile.in index ce9ef1f..265b098 100644 --- a/Makefile.in +++ b/Makefile.in @@ -480,6 +480,7 @@ enable_shared = @enable_shared@ enable_static = @enable_static@ examplesdir = @examplesdir@ exec_prefix = @exec_prefix@ +fmoddir = @fmoddir@ fortran_linux_linker_option = @fortran_linux_linker_option@ host = @host@ host_alias = @host_alias@ diff --git a/bin/Makefile.in b/bin/Makefile.in index 9f37771..4907405 100644 --- a/bin/Makefile.in +++ b/bin/Makefile.in @@ -591,6 +591,7 @@ enable_shared = @enable_shared@ enable_static = @enable_static@ examplesdir = @examplesdir@ exec_prefix = @exec_prefix@ +fmoddir = @fmoddir@ fortran_linux_linker_option = @fortran_linux_linker_option@ host = @host@ host_alias = @host_alias@ diff --git a/c++/Makefile.in b/c++/Makefile.in index ead78f6..9f053d2 100644 --- a/c++/Makefile.in +++ b/c++/Makefile.in @@ -642,6 +642,7 @@ enable_shared = @enable_shared@ enable_static = @enable_static@ examplesdir = @examplesdir@ exec_prefix = @exec_prefix@ +fmoddir = @fmoddir@ fortran_linux_linker_option = @fortran_linux_linker_option@ host = @host@ host_alias = @host_alias@ diff --git a/c++/examples/Makefile.in b/c++/examples/Makefile.in index fdfc2eb..1b250fd 100644 --- a/c++/examples/Makefile.in +++ b/c++/examples/Makefile.in @@ -589,6 +589,7 @@ enable_shared = @enable_shared@ enable_static = @enable_static@ examplesdir = @examplesdir@ exec_prefix = @exec_prefix@ +fmoddir = @fmoddir@ fortran_linux_linker_option = @fortran_linux_linker_option@ host = @host@ host_alias = @host_alias@ diff --git a/c++/src/Makefile.in b/c++/src/Makefile.in index 75343ea..b6498e0 100644 --- a/c++/src/Makefile.in +++ b/c++/src/Makefile.in @@ -655,6 +655,7 @@ enable_shared = @enable_shared@ enable_static = @enable_static@ examplesdir = @examplesdir@ exec_prefix = @exec_prefix@ +fmoddir = @fmoddir@ fortran_linux_linker_option = @fortran_linux_linker_option@ host = @host@ host_alias = @host_alias@ diff --git a/c++/test/Makefile.in b/c++/test/Makefile.in index b72560e..f3a2cf4 100644 --- a/c++/test/Makefile.in +++ b/c++/test/Makefile.in @@ -644,6 +644,7 @@ enable_shared = @enable_shared@ enable_static = @enable_static@ examplesdir = @examplesdir@ exec_prefix = @exec_prefix@ +fmoddir = @fmoddir@ fortran_linux_linker_option = @fortran_linux_linker_option@ host = @host@ host_alias = @host_alias@ @@ -822,6 +822,7 @@ FORTRAN_HAVE_C_SIZEOF_TRUE FORTRAN_HAVE_SIZEOF_FALSE FORTRAN_HAVE_SIZEOF_TRUE FCLIBS +fmoddir F9XMODEXT F9XMODFLAG FSEARCH_DIRS @@ -943,7 +944,6 @@ infodir docdir oldincludedir includedir -runstatedir localstatedir sharedstatedir sysconfdir @@ -974,10 +974,12 @@ enable_dependency_tracking enable_unsupported enable_fortran enable_fortran2003 +with_fmoddir enable_cxx enable_hl enable_hltools enable_tests +enable_test_express enable_tools enable_doxygen enable_doxygen_doc @@ -1089,7 +1091,6 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' -runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -1342,15 +1343,6 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; - -runstatedir | --runstatedir | --runstatedi | --runstated \ - | --runstate | --runstat | --runsta | --runst | --runs \ - | --run | --ru | --r) - ac_prev=runstatedir ;; - -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ - | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ - | --run=* | --ru=* | --r=*) - runstatedir=$ac_optarg ;; - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1488,7 +1480,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir runstatedir + libdir localedir mandir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1641,7 +1633,6 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -1707,6 +1698,8 @@ Optional Features: --enable-hl Enable the high level library [default=yes] --enable-hltools Enable the high-level tools [default=yes)] --enable-tests Compile the HDF5 tests [default=yes] + --enable-test-express Set HDF5 testing intensity level (0-3) [0 = + exhaustive testing; 3 = quicker testing; default=3] --enable-tools Compile the HDF5 tools [default=yes] --enable-doxygen Compile the HDF5 doxygen files [default=no] --disable-doxygen-doc don't generate any doxygen documentation @@ -1815,6 +1808,7 @@ Optional Features: Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) + --with-fmoddir=DIR Fortran module install directory --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use both] --with-aix-soname=aix|svr4|both @@ -4074,6 +4068,8 @@ AM_CXXFLAGS="${AM_CXXFLAGS}" AM_FCFLAGS="${AM_FCFLAGS}" AM_CPPFLAGS="${AM_CPPFLAGS}" AM_LDFLAGS="${AM_LDFLAGS}" + +## Flags passed in by the user CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" FCFLAGS="${FCFLAGS}" @@ -4188,9 +4184,10 @@ $as_echo "$hdf5_cv_host" >&6; }; if test $hdf5_cv_host = "none"; then hdf5_cv_host=$host elif test $hdf5_cv_host != $host; then - echo "The config.cache file was generated on $hdf5_cv_host but" - echo "this is $host. Please remove that file and try again." - as_fn_error $? "config.cache file is invalid" "$LINENO" 5 + as_fn_error $? " + The config.cache file was generated on $hdf5_cv_host but + this is $host. Please remove that file and try again. + config.cache file is invalid" "$LINENO" 5 fi ## ---------------------------------------------------------------------- @@ -4350,7 +4347,7 @@ $as_echo "$CLANG_SANITIZE_CHECKS" >&6; } # 'address;undefined'. Which and which combinations of these are # supported varies by compiler version, but unsupported options # or combinations will result in configure errors reported in config.log. - # Comma separated lists of sanitize options wil be entered intact in + # Comma separated lists of sanitize options will be entered intact in # one -fsanitize=<list> flag. Space separated lists will be entered in # separate -fsanitize=<item> flags. # NOTE: No sanity checking done here! @@ -6095,6 +6092,18 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + ## Allow setting the fortran module install dir + +# Check whether --with-fmoddir was given. +if test "${with_fmoddir+set}" = set; then : + withval=$with_fmoddir; fmoddir=$withval +else + fmoddir="\${includedir}" +fi + + fmoddir=$fmoddir + + ## Change to the Fortran 90 language ac_ext=${ac_fc_srcext-f} ac_compile='$FC -c $FCFLAGS $ac_fcflags_srcext conftest.$ac_ext >&5' @@ -8061,6 +8070,40 @@ $as_echo "no" >&6; } fi ## ---------------------------------------------------------------------- +## Check what level of testing should be enabled +## + +## Default is quickest testing +TEST_EXPRESS_LEVEL_DEFAULT=3 + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if HDF5 testing intensity level is set" >&5 +$as_echo_n "checking if HDF5 testing intensity level is set... " >&6; } + +# Check whether --enable-test-express was given. +if test "${enable_test_express+set}" = set; then : + enableval=$enable_test_express; TEST_EXPRESS_LEVEL_DEFAULT=$enableval +fi + + +case "X-$TEST_EXPRESS_LEVEL_DEFAULT" in + X-0|X-1|X-2|X-3) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $TEST_EXPRESS_LEVEL_DEFAULT" >&5 +$as_echo "$TEST_EXPRESS_LEVEL_DEFAULT" >&6; } + ;; + *) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: error" >&5 +$as_echo "error" >&6; } + as_fn_error $? "$TEST_EXPRESS_LEVEL_DEFAULT is not a valid test express level" "$LINENO" 5 + ;; +esac + + +cat >>confdefs.h <<_ACEOF +#define TEST_EXPRESS_LEVEL_DEFAULT $TEST_EXPRESS_LEVEL_DEFAULT +_ACEOF + + +## ---------------------------------------------------------------------- ## Check if they would like to disable building tools ## @@ -25314,7 +25357,7 @@ else We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -25346,7 +25389,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -25402,7 +25445,7 @@ else We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; @@ -25434,7 +25477,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext We can't simply define LARGE_OFF_T to be 9223372036854775807, since some C++ compilers masquerading as C compilers incorrectly reject 9223372036854775807. */ -#define LARGE_OFF_T ((((off_t) 1 << 31) << 31) - 1 + (((off_t) 1 << 31) << 31)) +#define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62)) int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1]; diff --git a/examples/Makefile.in b/examples/Makefile.in index 0d09a55..af3d7da 100644 --- a/examples/Makefile.in +++ b/examples/Makefile.in @@ -589,6 +589,7 @@ enable_shared = @enable_shared@ enable_static = @enable_static@ examplesdir = @examplesdir@ exec_prefix = @exec_prefix@ +fmoddir = @fmoddir@ fortran_linux_linker_option = @fortran_linux_linker_option@ host = @host@ host_alias = @host_alias@ diff --git a/fortran/Makefile.in b/fortran/Makefile.in index 0f667cb..1fcbe05 100644 --- a/fortran/Makefile.in +++ b/fortran/Makefile.in @@ -646,6 +646,7 @@ enable_shared = @enable_shared@ enable_static = @enable_static@ examplesdir = @examplesdir@ exec_prefix = @exec_prefix@ +fmoddir = @fmoddir@ fortran_linux_linker_option = @fortran_linux_linker_option@ host = @host@ host_alias = @host_alias@ diff --git a/fortran/examples/Makefile.in b/fortran/examples/Makefile.in index 3d58623..a02ec7f 100644 --- a/fortran/examples/Makefile.in +++ b/fortran/examples/Makefile.in @@ -597,6 +597,7 @@ enable_shared = @enable_shared@ enable_static = @enable_static@ examplesdir = @examplesdir@ exec_prefix = @exec_prefix@ +fmoddir = @fmoddir@ fortran_linux_linker_option = @fortran_linux_linker_option@ host = @host@ host_alias = @host_alias@ diff --git a/fortran/src/Makefile.in b/fortran/src/Makefile.in index fb9882a..fe7d46e 100644 --- a/fortran/src/Makefile.in +++ b/fortran/src/Makefile.in @@ -475,7 +475,7 @@ AM_CPPFLAGS = @AM_CPPFLAGS@ @H5_CPPFLAGS@ -I$(top_srcdir)/src AM_CXXFLAGS = @AM_CXXFLAGS@ @H5_CXXFLAGS@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AM_FCFLAGS = @AM_FCFLAGS@ @H5_FCFLAGS@ -I$(top_srcdir)/src \ - -I$(top_srcdir)/fortran/src + -I$(top_srcdir)/fortran/src $(F9XMODFLAG)$(fmoddir) AM_LDFLAGS = @AM_LDFLAGS@ @H5_LDFLAGS@ $(am__append_1) AR = @AR@ AUTOCONF = @AUTOCONF@ @@ -706,6 +706,7 @@ enable_shared = @enable_shared@ enable_static = @enable_static@ examplesdir = @examplesdir@ exec_prefix = @exec_prefix@ +fmoddir = @fmoddir@ fortran_linux_linker_option = @fortran_linux_linker_option@ host = @host@ host_alias = @host_alias@ @@ -1458,15 +1459,15 @@ clean-local: install-data-local: @if test -n "$(F9XMODEXT)" && test "X$(F9XMODEXT)" != "Xo"; then \ - $(CP) $(top_builddir)/$(subdir)/*.$(F9XMODEXT) $(DESTDIR)$(includedir)/. ; \ + $(CP) $(top_builddir)/$(subdir)/*.$(F9XMODEXT) $(DESTDIR)$(fmoddir)/. ; \ fi $(CP) $(top_builddir)/$(subdir)/H5f90i_gen.h $(DESTDIR)$(includedir)/. $(CP) $(top_srcdir)/fortran/src/H5f90i.h $(DESTDIR)$(includedir)/. uninstall-local: @if test -n "$(F9XMODEXT)" -a "X$(F9XMODEXT)" != "Xo"; then \ - if test -f "$(includedir)/hdf5.$(F9XMODEXT)" -o -f "$(includedir)/HDF5.$(F9XMODEXT)"; then \ - set -x; $(RM) $(DESTDIR)$(includedir)/*.$(F9XMODEXT); \ + if test -f "$(fmoddir)/hdf5.$(F9XMODEXT)" -o -f "$(fmoddir)/HDF5.$(F9XMODEXT)"; then \ + set -x; $(RM) $(DESTDIR)$(fmoddir)/*.$(F9XMODEXT); \ fi; \ fi; \ $(RM) $(DESTDIR)$(bindir)/$(H5FC_NAME) diff --git a/fortran/test/Makefile.in b/fortran/test/Makefile.in index 268aeba..6742d38 100644 --- a/fortran/test/Makefile.in +++ b/fortran/test/Makefile.in @@ -714,6 +714,7 @@ enable_shared = @enable_shared@ enable_static = @enable_static@ examplesdir = @examplesdir@ exec_prefix = @exec_prefix@ +fmoddir = @fmoddir@ fortran_linux_linker_option = @fortran_linux_linker_option@ host = @host@ host_alias = @host_alias@ diff --git a/fortran/testpar/Makefile.in b/fortran/testpar/Makefile.in index 61dec34..0cd57b7 100644 --- a/fortran/testpar/Makefile.in +++ b/fortran/testpar/Makefile.in @@ -642,6 +642,7 @@ enable_shared = @enable_shared@ enable_static = @enable_static@ examplesdir = @examplesdir@ exec_prefix = @exec_prefix@ +fmoddir = @fmoddir@ fortran_linux_linker_option = @fortran_linux_linker_option@ host = @host@ host_alias = @host_alias@ diff --git a/hl/Makefile.in b/hl/Makefile.in index 08b3aac..df79bb5 100644 --- a/hl/Makefile.in +++ b/hl/Makefile.in @@ -646,6 +646,7 @@ enable_shared = @enable_shared@ enable_static = @enable_static@ examplesdir = @examplesdir@ exec_prefix = @exec_prefix@ +fmoddir = @fmoddir@ fortran_linux_linker_option = @fortran_linux_linker_option@ host = @host@ host_alias = @host_alias@ diff --git a/hl/c++/Makefile.in b/hl/c++/Makefile.in index 3af1be9..02afff4 100644 --- a/hl/c++/Makefile.in +++ b/hl/c++/Makefile.in @@ -642,6 +642,7 @@ enable_shared = @enable_shared@ enable_static = @enable_static@ examplesdir = @examplesdir@ exec_prefix = @exec_prefix@ +fmoddir = @fmoddir@ fortran_linux_linker_option = @fortran_linux_linker_option@ host = @host@ host_alias = @host_alias@ diff --git a/hl/c++/examples/Makefile.in b/hl/c++/examples/Makefile.in index 7bdf3b7..00b5a68 100644 --- a/hl/c++/examples/Makefile.in +++ b/hl/c++/examples/Makefile.in @@ -589,6 +589,7 @@ enable_shared = @enable_shared@ enable_static = @enable_static@ examplesdir = @examplesdir@ exec_prefix = @exec_prefix@ +fmoddir = @fmoddir@ fortran_linux_linker_option = @fortran_linux_linker_option@ host = @host@ host_alias = @host_alias@ diff --git a/hl/c++/src/Makefile.in b/hl/c++/src/Makefile.in index 099f4e6..051f5ee 100644 --- a/hl/c++/src/Makefile.in +++ b/hl/c++/src/Makefile.in @@ -645,6 +645,7 @@ enable_shared = @enable_shared@ enable_static = @enable_static@ examplesdir = @examplesdir@ exec_prefix = @exec_prefix@ +fmoddir = @fmoddir@ fortran_linux_linker_option = @fortran_linux_linker_option@ host = @host@ host_alias = @host_alias@ diff --git a/hl/c++/test/Makefile.in b/hl/c++/test/Makefile.in index 3d38637..71e835a 100644 --- a/hl/c++/test/Makefile.in +++ b/hl/c++/test/Makefile.in @@ -642,6 +642,7 @@ enable_shared = @enable_shared@ enable_static = @enable_static@ examplesdir = @examplesdir@ exec_prefix = @exec_prefix@ +fmoddir = @fmoddir@ fortran_linux_linker_option = @fortran_linux_linker_option@ host = @host@ host_alias = @host_alias@ diff --git a/hl/examples/Makefile.in b/hl/examples/Makefile.in index 95c0b0d..d019ffa 100644 --- a/hl/examples/Makefile.in +++ b/hl/examples/Makefile.in @@ -589,6 +589,7 @@ enable_shared = @enable_shared@ enable_static = @enable_static@ examplesdir = @examplesdir@ exec_prefix = @exec_prefix@ +fmoddir = @fmoddir@ fortran_linux_linker_option = @fortran_linux_linker_option@ host = @host@ host_alias = @host_alias@ diff --git a/hl/fortran/Makefile.in b/hl/fortran/Makefile.in index 8417b8e..da2b0bd 100644 --- a/hl/fortran/Makefile.in +++ b/hl/fortran/Makefile.in @@ -646,6 +646,7 @@ enable_shared = @enable_shared@ enable_static = @enable_static@ examplesdir = @examplesdir@ exec_prefix = @exec_prefix@ +fmoddir = @fmoddir@ fortran_linux_linker_option = @fortran_linux_linker_option@ host = @host@ host_alias = @host_alias@ diff --git a/hl/fortran/examples/Makefile.in b/hl/fortran/examples/Makefile.in index 76af11c..24fb57d 100644 --- a/hl/fortran/examples/Makefile.in +++ b/hl/fortran/examples/Makefile.in @@ -590,6 +590,7 @@ enable_shared = @enable_shared@ enable_static = @enable_static@ examplesdir = @examplesdir@ exec_prefix = @exec_prefix@ +fmoddir = @fmoddir@ fortran_linux_linker_option = @fortran_linux_linker_option@ host = @host@ host_alias = @host_alias@ diff --git a/hl/fortran/src/Makefile.in b/hl/fortran/src/Makefile.in index 5e0a4d6..5ef19e9 100644 --- a/hl/fortran/src/Makefile.in +++ b/hl/fortran/src/Makefile.in @@ -432,7 +432,8 @@ AM_CPPFLAGS = @AM_CPPFLAGS@ @H5_CPPFLAGS@ -I$(top_srcdir)/src \ AM_CXXFLAGS = @AM_CXXFLAGS@ @H5_CXXFLAGS@ AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AM_FCFLAGS = @AM_FCFLAGS@ @H5_FCFLAGS@ -I$(top_builddir)/fortran/src \ - $(F9XMODFLAG)$(top_builddir)/fortran/src + $(F9XMODFLAG)$(top_builddir)/fortran/src \ + $(F9XMODFLAG)$(fmoddir) AM_LDFLAGS = @AM_LDFLAGS@ @H5_LDFLAGS@ $(am__append_1) AR = @AR@ AUTOCONF = @AUTOCONF@ @@ -663,6 +664,7 @@ enable_shared = @enable_shared@ enable_static = @enable_static@ examplesdir = @examplesdir@ exec_prefix = @exec_prefix@ +fmoddir = @fmoddir@ fortran_linux_linker_option = @fortran_linux_linker_option@ host = @host@ host_alias = @host_alias@ @@ -1335,13 +1337,13 @@ clean-local: install-data-local: @if test -n "$(F9XMODEXT)" && test "X$(F9XMODEXT)" != "Xo"; then \ - $(CP) $(top_builddir)/$(subdir)/*.$(F9XMODEXT) $(DESTDIR)$(includedir)/. ; \ + $(CP) $(top_builddir)/$(subdir)/*.$(F9XMODEXT) $(DESTDIR)$(fmoddir)/. ; \ fi uninstall-local: @if test -n "$(F9XMODEXT)" -a "X$(F9XMODEXT)" != "Xo"; then \ - if test -f "$(includedir)/hdf5.$(F9XMODEXT)" -o -f "$(DESTDIR)$(includedir)/HDF5.$(F9XMODEXT)"; then \ - set -x; $(RM) $(includedir)/*.$(F9XMODEXT); \ + if test -f "$(fmoddir)/hdf5.$(F9XMODEXT)" -o -f "$(DESTDIR)$(fmoddir)/HDF5.$(F9XMODEXT)"; then \ + set -x; $(RM) $(fmoddir)/*.$(F9XMODEXT); \ fi; \ fi diff --git a/hl/fortran/test/Makefile.in b/hl/fortran/test/Makefile.in index d0e4601..1cb3ed8 100644 --- a/hl/fortran/test/Makefile.in +++ b/hl/fortran/test/Makefile.in @@ -654,6 +654,7 @@ enable_shared = @enable_shared@ enable_static = @enable_static@ examplesdir = @examplesdir@ exec_prefix = @exec_prefix@ +fmoddir = @fmoddir@ fortran_linux_linker_option = @fortran_linux_linker_option@ host = @host@ host_alias = @host_alias@ diff --git a/hl/src/Makefile.in b/hl/src/Makefile.in index 7761a9e..7eed4df 100644 --- a/hl/src/Makefile.in +++ b/hl/src/Makefile.in @@ -644,6 +644,7 @@ enable_shared = @enable_shared@ enable_static = @enable_static@ examplesdir = @examplesdir@ exec_prefix = @exec_prefix@ +fmoddir = @fmoddir@ fortran_linux_linker_option = @fortran_linux_linker_option@ host = @host@ host_alias = @host_alias@ diff --git a/hl/test/Makefile.in b/hl/test/Makefile.in index d941e75..39af880 100644 --- a/hl/test/Makefile.in +++ b/hl/test/Makefile.in @@ -680,6 +680,7 @@ enable_shared = @enable_shared@ enable_static = @enable_static@ examplesdir = @examplesdir@ exec_prefix = @exec_prefix@ +fmoddir = @fmoddir@ fortran_linux_linker_option = @fortran_linux_linker_option@ host = @host@ host_alias = @host_alias@ diff --git a/hl/tools/Makefile.in b/hl/tools/Makefile.in index 3e2d33b..4d9dcfb 100644 --- a/hl/tools/Makefile.in +++ b/hl/tools/Makefile.in @@ -643,6 +643,7 @@ enable_shared = @enable_shared@ enable_static = @enable_static@ examplesdir = @examplesdir@ exec_prefix = @exec_prefix@ +fmoddir = @fmoddir@ fortran_linux_linker_option = @fortran_linux_linker_option@ host = @host@ host_alias = @host_alias@ diff --git a/hl/tools/gif2h5/Makefile.in b/hl/tools/gif2h5/Makefile.in index 973e6ad..b1c595e 100644 --- a/hl/tools/gif2h5/Makefile.in +++ b/hl/tools/gif2h5/Makefile.in @@ -658,6 +658,7 @@ enable_shared = @enable_shared@ enable_static = @enable_static@ examplesdir = @examplesdir@ exec_prefix = @exec_prefix@ +fmoddir = @fmoddir@ fortran_linux_linker_option = @fortran_linux_linker_option@ host = @host@ host_alias = @host_alias@ diff --git a/src/H5config.h.in b/src/H5config.h.in index f57b5e1..24dd587 100644 --- a/src/H5config.h.in +++ b/src/H5config.h.in @@ -542,6 +542,9 @@ PTHREAD_SCOPE_SYSTEM) call. */ #undef SYSTEM_SCOPE_THREADS +/* HDF5 testing intensity level */ +#undef TEST_EXPRESS_LEVEL_DEFAULT + /* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */ #undef TIME_WITH_SYS_TIME diff --git a/src/Makefile.in b/src/Makefile.in index c7a2989..b9b7130 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -751,6 +751,7 @@ enable_shared = @enable_shared@ enable_static = @enable_static@ examplesdir = @examplesdir@ exec_prefix = @exec_prefix@ +fmoddir = @fmoddir@ fortran_linux_linker_option = @fortran_linux_linker_option@ host = @host@ host_alias = @host_alias@ diff --git a/test/Makefile.in b/test/Makefile.in index 397b536..c8637fe 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -1044,6 +1044,7 @@ enable_shared = @enable_shared@ enable_static = @enable_static@ examplesdir = @examplesdir@ exec_prefix = @exec_prefix@ +fmoddir = @fmoddir@ fortran_linux_linker_option = @fortran_linux_linker_option@ host = @host@ host_alias = @host_alias@ diff --git a/testpar/Makefile.in b/testpar/Makefile.in index 7141c06..1ae2e4b 100644 --- a/testpar/Makefile.in +++ b/testpar/Makefile.in @@ -675,6 +675,7 @@ enable_shared = @enable_shared@ enable_static = @enable_static@ examplesdir = @examplesdir@ exec_prefix = @exec_prefix@ +fmoddir = @fmoddir@ fortran_linux_linker_option = @fortran_linux_linker_option@ host = @host@ host_alias = @host_alias@ diff --git a/tools/Makefile.in b/tools/Makefile.in index 4015272..668a6c7 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -644,6 +644,7 @@ enable_shared = @enable_shared@ enable_static = @enable_static@ examplesdir = @examplesdir@ exec_prefix = @exec_prefix@ +fmoddir = @fmoddir@ fortran_linux_linker_option = @fortran_linux_linker_option@ host = @host@ host_alias = @host_alias@ diff --git a/tools/h5copy/Makefile.in b/tools/h5copy/Makefile.in index 734d23a..3d1998a 100644 --- a/tools/h5copy/Makefile.in +++ b/tools/h5copy/Makefile.in @@ -643,6 +643,7 @@ enable_shared = @enable_shared@ enable_static = @enable_static@ examplesdir = @examplesdir@ exec_prefix = @exec_prefix@ +fmoddir = @fmoddir@ fortran_linux_linker_option = @fortran_linux_linker_option@ host = @host@ host_alias = @host_alias@ diff --git a/tools/h5diff/Makefile.in b/tools/h5diff/Makefile.in index 3121aa5..15a4d0c 100644 --- a/tools/h5diff/Makefile.in +++ b/tools/h5diff/Makefile.in @@ -672,6 +672,7 @@ enable_shared = @enable_shared@ enable_static = @enable_static@ examplesdir = @examplesdir@ exec_prefix = @exec_prefix@ +fmoddir = @fmoddir@ fortran_linux_linker_option = @fortran_linux_linker_option@ host = @host@ host_alias = @host_alias@ diff --git a/tools/h5dump/Makefile.in b/tools/h5dump/Makefile.in index e0e4cc0..78ea8ff 100644 --- a/tools/h5dump/Makefile.in +++ b/tools/h5dump/Makefile.in @@ -675,6 +675,7 @@ enable_shared = @enable_shared@ enable_static = @enable_static@ examplesdir = @examplesdir@ exec_prefix = @exec_prefix@ +fmoddir = @fmoddir@ fortran_linux_linker_option = @fortran_linux_linker_option@ host = @host@ host_alias = @host_alias@ diff --git a/tools/h5import/Makefile.in b/tools/h5import/Makefile.in index a14184f..c25cce5 100644 --- a/tools/h5import/Makefile.in +++ b/tools/h5import/Makefile.in @@ -644,6 +644,7 @@ enable_shared = @enable_shared@ enable_static = @enable_static@ examplesdir = @examplesdir@ exec_prefix = @exec_prefix@ +fmoddir = @fmoddir@ fortran_linux_linker_option = @fortran_linux_linker_option@ host = @host@ host_alias = @host_alias@ diff --git a/tools/h5jam/Makefile.in b/tools/h5jam/Makefile.in index 8429fca..ff150c3 100644 --- a/tools/h5jam/Makefile.in +++ b/tools/h5jam/Makefile.in @@ -662,6 +662,7 @@ enable_shared = @enable_shared@ enable_static = @enable_static@ examplesdir = @examplesdir@ exec_prefix = @exec_prefix@ +fmoddir = @fmoddir@ fortran_linux_linker_option = @fortran_linux_linker_option@ host = @host@ host_alias = @host_alias@ diff --git a/tools/h5ls/Makefile.in b/tools/h5ls/Makefile.in index a00bba1..8e14cb0 100644 --- a/tools/h5ls/Makefile.in +++ b/tools/h5ls/Makefile.in @@ -657,6 +657,7 @@ enable_shared = @enable_shared@ enable_static = @enable_static@ examplesdir = @examplesdir@ exec_prefix = @exec_prefix@ +fmoddir = @fmoddir@ fortran_linux_linker_option = @fortran_linux_linker_option@ host = @host@ host_alias = @host_alias@ diff --git a/tools/h5repack/Makefile.in b/tools/h5repack/Makefile.in index da8ef9e..9c289b6 100644 --- a/tools/h5repack/Makefile.in +++ b/tools/h5repack/Makefile.in @@ -717,6 +717,7 @@ enable_shared = @enable_shared@ enable_static = @enable_static@ examplesdir = @examplesdir@ exec_prefix = @exec_prefix@ +fmoddir = @fmoddir@ fortran_linux_linker_option = @fortran_linux_linker_option@ host = @host@ host_alias = @host_alias@ diff --git a/tools/h5stat/Makefile.in b/tools/h5stat/Makefile.in index f1ab0bd..7d8a6e8 100644 --- a/tools/h5stat/Makefile.in +++ b/tools/h5stat/Makefile.in @@ -645,6 +645,7 @@ enable_shared = @enable_shared@ enable_static = @enable_static@ examplesdir = @examplesdir@ exec_prefix = @exec_prefix@ +fmoddir = @fmoddir@ fortran_linux_linker_option = @fortran_linux_linker_option@ host = @host@ host_alias = @host_alias@ diff --git a/tools/lib/Makefile.in b/tools/lib/Makefile.in index 271b4a3..c833c10 100644 --- a/tools/lib/Makefile.in +++ b/tools/lib/Makefile.in @@ -640,6 +640,7 @@ enable_shared = @enable_shared@ enable_static = @enable_static@ examplesdir = @examplesdir@ exec_prefix = @exec_prefix@ +fmoddir = @fmoddir@ fortran_linux_linker_option = @fortran_linux_linker_option@ host = @host@ host_alias = @host_alias@ diff --git a/tools/libtest/Makefile.in b/tools/libtest/Makefile.in index 4e9bb8b..24e6b41 100644 --- a/tools/libtest/Makefile.in +++ b/tools/libtest/Makefile.in @@ -642,6 +642,7 @@ enable_shared = @enable_shared@ enable_static = @enable_static@ examplesdir = @examplesdir@ exec_prefix = @exec_prefix@ +fmoddir = @fmoddir@ fortran_linux_linker_option = @fortran_linux_linker_option@ host = @host@ host_alias = @host_alias@ diff --git a/tools/misc/Makefile.in b/tools/misc/Makefile.in index 6095288..ef3c729 100644 --- a/tools/misc/Makefile.in +++ b/tools/misc/Makefile.in @@ -662,6 +662,7 @@ enable_shared = @enable_shared@ enable_static = @enable_static@ examplesdir = @examplesdir@ exec_prefix = @exec_prefix@ +fmoddir = @fmoddir@ fortran_linux_linker_option = @fortran_linux_linker_option@ host = @host@ host_alias = @host_alias@ diff --git a/tools/perform/Makefile.in b/tools/perform/Makefile.in index ada6475..441f86c 100644 --- a/tools/perform/Makefile.in +++ b/tools/perform/Makefile.in @@ -681,6 +681,7 @@ enable_shared = @enable_shared@ enable_static = @enable_static@ examplesdir = @examplesdir@ exec_prefix = @exec_prefix@ +fmoddir = @fmoddir@ fortran_linux_linker_option = @fortran_linux_linker_option@ host = @host@ host_alias = @host_alias@ |