Author: Gilles Filippini Description: fix build flag for HDF5 library. --- a/etc/config/m4/ax_lib_hdf5.m4 +++ b/etc/config/m4/ax_lib_hdf5.m4 @@ -243,7 +243,15 @@ ff_hlib=""; # remove -lhdf5 for arg in $HDF5_LIBS; do if [ "-lhdf5" != "$arg" ] ;then ff_hlib="$ff_hlib $arg"; fi;done - HDF5_LIBS="$ff_hlib -lhdf5" # add -lhdf5 + HDF5_LIBS="${HDF5_LIBS#"${HDF5_LIBS%%[![:space:]]*}"}" + HDF5_INFIX= + case "$HDF5_LIBS" in + -lhdf5_*) + HDF5_INFIX="${HDF5_LIBS#-lhdf5_}" + HDF5_INFIX="_${HDF5_INFIX%%_*}" + ;; + esac + HDF5_LIBS="-lhdf5$HDF5_INFIX $HDF5_LIBS" AC_MSG_RESULT([yes (version $[HDF5_VERSION])]) dnl See if we can compile @@ -257,8 +265,7 @@ LIBS=$HDF5_LIBS LDFLAGS=$HDF5_LDFLAGS AC_CHECK_HEADER([hdf5.h], [ac_cv_hadf5_h=yes], [ac_cv_hadf5_h=no]) - AC_CHECK_LIB([hdf5], [H5Fcreate], [ac_cv_libhdf5=yes], - [ac_cv_libhdf5=no]) + AC_CHECK_LIB([hdf5${HDF5_INFIX}_hl],[H5PTcreate], [HDF5_LIBS="-lhdf5${HDF5_INFIX}_hl $HDF5_LIBS"], [], []) if test "$ac_cv_hadf5_h" = "no" && test "$ac_cv_libhdf5" = "no" ; then AC_MSG_WARN([Unable to compile HDF5 test program]) fi @@ -300,9 +307,9 @@ for arg in $HDF5_LIBS do case "$arg" in #( - -lhdf5_hl) HDF5_FLIBS="$HDF5_FLIBS -lhdf5hl_fortran $arg" + -lhdf5${HDF5_INFIX}_hl) HDF5_FLIBS="$HDF5_FLIBS -lhdf5${HDF5_INFIX}_hl_fortran $arg" ;; #( - -lhdf5) HDF5_FLIBS="$HDF5_FLIBS -lhdf5_fortran $arg" + -lhdf5${HDF5_INFIX}) HDF5_FLIBS="$HDF5_FLIBS -lhdf5${HDF5_INFIX}_fortran $arg" ;; #( *) HDF5_FLIBS="$HDF5_FLIBS $arg" ;;