diff options
| author | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2017-08-03 15:30:26 (GMT) |
|---|---|---|
| committer | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2017-08-03 15:30:26 (GMT) |
| commit | a6d5bf1a86250cc660cd1ed420eeda6940792be5 (patch) | |
| tree | 6332dc38a8307c9399a4180a6a30ead77f87e478 | |
| parent | 00a50b6d72656429b0c55d68ed2fcf53e713ed70 (diff) | |
| parent | 2a1e499b0134ed319cd9d60a6521ba83b3a2cfa8 (diff) | |
| download | hdf5-a6d5bf1a86250cc660cd1ed420eeda6940792be5.zip hdf5-a6d5bf1a86250cc660cd1ed420eeda6940792be5.tar.gz hdf5-a6d5bf1a86250cc660cd1ed420eeda6940792be5.tar.bz2 | |
Merge pull request #630 in HDFFV/hdf5 from ~BRTNFLD/hdf5_msb:develop to develop
* commit '2a1e499b0134ed319cd9d60a6521ba83b3a2cfa8':
changed comments, (HDFFV-10037)
changed the test for NAG fortran compiler, (HDFFV-10037)
| -rw-r--r-- | configure.ac | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index cf82a2e..91800e7 100644 --- a/configure.ac +++ b/configure.ac @@ -3340,10 +3340,10 @@ fi if test "X$HDF_FORTRAN" = "Xyes"; then - ### libtool does not pass the correct argument linking (-WL,-WL,,) for the NAG Fortran compiler + ### libtool does not pass the correct argument linking (-Wl,-Wl,,) for the NAG Fortran compiler ### on Linux (other OSs have not been tested). ### Therefore, detect if we are using the NAG Fortran compiler, and replace the wl="-Wl," for Fortran to - ### wl="-Wl,-WL,," in the libtool file. (HDFFV-10037) + ### wl="-Wl,-Wl,," in the libtool file. (HDFFV-10037) case "`uname`" in Linux*) @@ -3510,13 +3510,13 @@ if test "X$HDF_FORTRAN" = "Xyes"; then ;; esac - ### libtool does not pass the correct argument linking (-WL,-WL,,) for the NAG Fortran compiler + ### libtool does not pass the correct argument linking (-Wl,-Wl,,) for the NAG Fortran compiler ### on Linux (other OSs have not been tested). ### Therefore, detect if we are using the NAG Fortran compiler, and replace the wl="-Wl," for Fortran to - ### wl="-Wl,-WL,," in the libtool file. (HDFFV-10037) + ### wl="-Wl,-Wl,," in the libtool file. (HDFFV-10037) case "`uname`" in Linux*) - if (grep -i 'NAG_Fortran' libtool > /dev/null); then + if test "X$FC_BASENAME" = "Xnagfor"; then cat libtool | awk '/NAG_Fortran/{flag=1}flag&&/wl=/{$NF="wl=\"-Wl,Wl,,\"";flag=0}1' > libtool.tmp && mv -f libtool.tmp libtool && chmod 755 libtool fi ;; |