diff options
author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2022-07-28 15:05:31 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-07-28 15:05:31 (GMT) |
commit | 6e92521311713123a6b2ab3b0a25f1b138f16e27 (patch) | |
tree | f7ea0bb14473e33c643d65749d60515f83b7e3fd /fortran/src/h5fc.in | |
parent | 762c111350cc31137a80e24126b00d9aacf3b2a9 (diff) | |
download | hdf5-6e92521311713123a6b2ab3b0a25f1b138f16e27.zip hdf5-6e92521311713123a6b2ab3b0a25f1b138f16e27.tar.gz hdf5-6e92521311713123a6b2ab3b0a25f1b138f16e27.tar.bz2 |
1.8 fortran module folder from GH#1411 #1922 (#1944)
Diffstat (limited to 'fortran/src/h5fc.in')
-rw-r--r-- | fortran/src/h5fc.in | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/fortran/src/h5fc.in b/fortran/src/h5fc.in index 959971c..d9fc1f5 100644 --- a/fortran/src/h5fc.in +++ b/fortran/src/h5fc.in @@ -26,6 +26,7 @@ prefix="@prefix@" exec_prefix="@exec_prefix@" libdir="@libdir@" includedir="@includedir@" +fmoddir="@fmoddir@" HL="@HL@" ############################################################################ @@ -38,7 +39,7 @@ HL="@HL@" ## $FLINKER $FCFLAGS $H5BLD_FCFLAGS $F9XSUFFIXFLAG $LDFLAGS $LIBS ## ## $fmodules $link_objs $link_args $shared_link ## ## ## -## These settings can be overriden by setting HDF5_FCFLAGS, ## +## These settings can be overridden by setting HDF5_FCFLAGS, ## ## HDF5_LDFLAGS, or HDF5_LIBS in the environment. ## ## ## ############################################################################ @@ -75,12 +76,12 @@ SHOW="eval" FCBASE="@FC@" FLINKERBASE="@FC@" -# FCFLAGS and LDFLAGS are reserved for use by the script user. +# FCFLAGS and LDFLAGS are reserved for use by the script user. # FLAGS brought from the hdf5 build are put in H5BLD_*FLAGS. -# User's FCFLAGS come after their H5BLD counterparts. User's LDFLAGS come just -# before clibpath, user's LIBS come after $link_objs and before the hdf5 -# libraries in $link_args, followed by any external library paths and libraries +# User's FCFLAGS come after their H5BLD counterparts. User's LDFLAGS come just +# before clibpath, user's LIBS come after $link_objs and before the hdf5 +# libraries in $link_args, followed by any external library paths and libraries # from AM_LDFLAGS, LDFLAGS, AM_LIBS or LIBS carried in from the hdf5 build. # The order of the flags is intended to give precedence to the user's flags. H5BLD_FCFLAGS="@AM_FCFLAGS@ @FCFLAGS@" @@ -136,7 +137,7 @@ usage() { echo " shared libraries]" echo " " echo " You can also add or change paths and flags to the compile line using" - echo " the following environment varibles or by assigning them to their counterparts" + echo " the following environment variables or by assigning them to their counterparts" echo " in the 'Things You Can Modify to Override...'" section of $prog_name echo " " echo " Variable Current value to be replaced" @@ -278,7 +279,7 @@ done # It's possible that there isn't a modules flag... fmodules="" if test -n "$F9XMODFLAG"; then - fmodules="${F9XMODFLAG}${includedir}" + fmodules="${F9XMODFLAG}${fmoddir}" fi if test "x$do_compile" = "xyes"; then @@ -298,7 +299,7 @@ fi if test "x$do_link" = "xyes"; then shared_link="" -# conditionnaly link with the hl library +# conditionally link with the hl library if test "X$HL" = "Xhl"; then libraries=" $libraries -lhdf5hl_fortran -lhdf5_hl -lhdf5_fortran -lhdf5 " else @@ -358,9 +359,9 @@ if test "x$do_link" = "xyes"; then # module. It's okay if they're included twice in the compile line. link_args="$link_args $H5BLD_LDFLAGS $H5BLD_LIBS" - # User's FCFLAGS come after their H5BLD counterparts. User's LDFLAGS come just - # before clibpath, user's LIBS come after $link_objs and before the hdf5 - # libraries in $link_args, followed by any external library paths and libraries + # User's FCFLAGS come after their H5BLD counterparts. User's LDFLAGS come just + # before clibpath, user's LIBS come after $link_objs and before the hdf5 + # libraries in $link_args, followed by any external library paths and libraries # from AM_LDFLAGS, LDFLAGS, AM_LIBS or LIBS carried in from the hdf5 build. # The order of the flags is intended to give precedence to the user's flags. $SHOW $FLINKER $FCFLAGS $H5BLD_FCFLAGS $F9XSUFFIXFLAG $LDFLAGS $fmodules $link_objs $LIBS $link_args $shared_link |