diff options
author | Larry Knox <lrknox@hdfgroup.org> | 2020-07-02 19:14:53 (GMT) |
---|---|---|
committer | Larry Knox <lrknox@hdfgroup.org> | 2020-07-06 19:21:53 (GMT) |
commit | c6f2205abefa1a098bbb2b38a0318596fbb16eb3 (patch) | |
tree | 8d01fe5d6d4e09b9c048aa445bcdc0a06052633c /configure.ac | |
parent | 37f6de1b3037a2b7a569c2edb08f58f8ba323af0 (diff) | |
download | hdf5-c6f2205abefa1a098bbb2b38a0318596fbb16eb3.zip hdf5-c6f2205abefa1a098bbb2b38a0318596fbb16eb3.tar.gz hdf5-c6f2205abefa1a098bbb2b38a0318596fbb16eb3.tar.bz2 |
Merge pull request #2670 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:develop to develop
* commit 'fc69de0e8ae30e80c1c3c542b156226a75444525':
Lib files needed are now copied to a subdirectory in the java/test directory, and on Macs the loader path for libhdf5.xxxs.so is changed in the temporary copy of libhdf5_java.dylib. Fix for HDFFV-11063
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 74dd933..632906f 100644 --- a/configure.ac +++ b/configure.ac @@ -1149,12 +1149,13 @@ AC_CHECK_HEADERS([stdint.h], [C9x=yes]) AC_CHECK_HEADERS([stdbool.h]) ## Darwin -AC_CHECK_HEADERS([mach/mach_time.h]) -## Also need to detect Darwin for pubconf +AC_SUBST([H5_IS_DARWIN]) +H5_IS_DARWIN="no" case $host_os in darwin*) AC_DEFINE([HAVE_DARWIN], [1], [Define if Darwin or Mac OS X]) - ;; + H5_IS_DARWIN="yes" + ;; esac ## Windows |