diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2021-03-24 23:02:07 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2021-03-24 23:02:07 (GMT) |
| commit | bdac2ecdbff2c389a222b3d93ff1eb1d23ec6b23 (patch) | |
| tree | cdd7760978d1c76b264957e8856c982ab992d792 /m4 | |
| parent | 2e3b24078e63ae944fc1d1e7ef10a70dfd2ebac6 (diff) | |
| download | hdf5-bdac2ecdbff2c389a222b3d93ff1eb1d23ec6b23.zip hdf5-bdac2ecdbff2c389a222b3d93ff1eb1d23ec6b23.tar.gz hdf5-bdac2ecdbff2c389a222b3d93ff1eb1d23ec6b23.tar.bz2 | |
Brings some Autotools improvements over from develop
* configure.ac tidying
* helpful XCode comments
* FreeBSD improvements
* Fixes for finding Java on MacOS
* The improved warnhist script
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";; |