diff options
| author | Allen Byrne <50328838+byrnHDF@users.noreply.github.com> | 2021-02-03 05:48:07 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-03 05:48:07 (GMT) |
| commit | 202438695557ab629a85aa38cc2bec324b7cfafe (patch) | |
| tree | 106c76a60ca336e7c03a321fa287e60fa3ff4117 /m4 | |
| parent | 1bf8fa2665fd606d7c616eaa4223decfce2c25f2 (diff) | |
| download | hdf5-202438695557ab629a85aa38cc2bec324b7cfafe.zip hdf5-202438695557ab629a85aa38cc2bec324b7cfafe.tar.gz hdf5-202438695557ab629a85aa38cc2bec324b7cfafe.tar.bz2 | |
1 12 minor merges from develop (#297)
* OESS-98 fix tools test for plugins
* sync fork
* Merge of changes from dev
* Move problem option to bottom of the list until fixed
* HDFFV-11106 - fix parsing optional args
* HDFFV-11106 add note
* grammer fix
* Whitespace after clang formatting
* Undo format version 11 changes
* Update check to working version
* Merge workflow and minor changes from develop
* Update supported platforms
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/ax_jni_include_dir.m4 | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/m4/ax_jni_include_dir.m4 b/m4/ax_jni_include_dir.m4 index ae7a5f0..cd72098 100644 --- a/m4/ax_jni_include_dir.m4 +++ b/m4/ax_jni_include_dir.m4 @@ -73,13 +73,19 @@ fi case "$host_os" in darwin*) # Apple Java headers are inside the Xcode bundle. - macos_version=$(sw_vers -productVersion | sed -n -e 's/^@<:@0-9@:>@*.\(@<:@0-9@:>@*\).@<:@0-9@:>@*/\1/p') - if @<:@ "$macos_version" -gt "7" @:>@; then - _JTOPDIR="$(xcrun --show-sdk-path)/System/Library/Frameworks/JavaVM.framework" - _JINC="$_JTOPDIR/Headers" + major_macos_version=$(sw_vers -productVersion | sed -n -e 's/^\(@<:@0-9@:>@*\).@<:@0-9@:>@*.@<:@0-9@:>@*/\1/p') + if @<:@ "$major_macos_version" -gt "10" @:>@; then + _JTOPDIR="$(/usr/libexec/java_home)" + _JINC="$_JTOPDIR/include" else - _JTOPDIR="/System/Library/Frameworks/JavaVM.framework" - _JINC="$_JTOPDIR/Headers" + macos_version=$(sw_vers -productVersion | sed -n -e 's/^@<:@0-9@:>@*.\(@<:@0-9@:>@*\).@<:@0-9@:>@*/\1/p') + if @<:@ "$macos_version" -gt "7" @:>@; then + _JTOPDIR="$(xcrun --show-sdk-path)/System/Library/Frameworks/JavaVM.framework" + _JINC="$_JTOPDIR/Headers" + else + _JTOPDIR="/System/Library/Frameworks/JavaVM.framework" + _JINC="$_JTOPDIR/Headers" + fi fi ;; *) _JINC="$_JTOPDIR/include";; |