diff options
| author | M. Scot Breitenfeld <brtnfld@hdfgroup.org> | 2017-08-03 14:15:34 (GMT) |
|---|---|---|
| committer | M. Scot Breitenfeld <brtnfld@hdfgroup.org> | 2017-08-03 14:15:34 (GMT) |
| commit | e75b6ae724596c991fe4d91b8bf2d1b7cf24d7f4 (patch) | |
| tree | 68e21bee0c822822cdd83209cff67e0b353fdde6 | |
| parent | f05f98ef8d46b2aa302380573fd43ebe72b04a30 (diff) | |
| download | hdf5-e75b6ae724596c991fe4d91b8bf2d1b7cf24d7f4.zip hdf5-e75b6ae724596c991fe4d91b8bf2d1b7cf24d7f4.tar.gz hdf5-e75b6ae724596c991fe4d91b8bf2d1b7cf24d7f4.tar.bz2 | |
merged NAG changes from develop, (HDFFV-10037)
| -rw-r--r-- | configure.ac | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 469c3f5..c453699 100644 --- a/configure.ac +++ b/configure.ac @@ -3018,9 +3018,6 @@ AC_CONFIG_FILES([src/libhdf5.settings AC_OUTPUT chmod 755 tools/misc/h5cc -if test "X$HDF_FORTRAN" = "Xyes"; then - chmod 755 fortran/src/h5fc -fi if test "X$HDF_CXX" = "Xyes"; then chmod 755 c++/src/h5c++ fi @@ -3043,7 +3040,7 @@ if test "X$HDF_FORTRAN" = "Xyes"; then ### 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 ;; |