diff options
author | Larry Knox <lrknox@hdfgroup.org> | 2020-07-02 19:14:53 (GMT) |
---|---|---|
committer | Larry Knox <lrknox@hdfgroup.org> | 2020-07-06 17:34:51 (GMT) |
commit | 8171ef3c887f0870a6bbfd0b5b2376cfbef00bc9 (patch) | |
tree | ce088b428a34a86ff01509249081f179c1999746 /configure.ac | |
parent | 1cb7c1329759d92be95498cad0ecb5abb9b52f8d (diff) | |
download | hdf5-8171ef3c887f0870a6bbfd0b5b2376cfbef00bc9.zip hdf5-8171ef3c887f0870a6bbfd0b5b2376cfbef00bc9.tar.gz hdf5-8171ef3c887f0870a6bbfd0b5b2376cfbef00bc9.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 8585f5c..4a610d5 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 |