frost/secp256k1-zkp
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[build] Update ax_jni_include_dir.m4 macro to deal with recent versions of macOS

Browse Source
This commit is contained in:
Karl-Johan Alm 2017-07-06 18:04:52 +09:00
parent 84973d393a
commit 5b22977922
No known key found for this signature in database
GPG Key ID: 57AF762DB3353322
1 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
build-aux/m4/ax_jni_include_dir.m4
View File

@ -1,5 +1,5 @@
# =========================================================================== # ===========================================================================
# http://www.gnu.org/software/autoconf-archive/ax_jni_include_dir.html # https://www.gnu.org/software/autoconf-archive/ax_jni_include_dir.html
# =========================================================================== # ===========================================================================
# #
# SYNOPSIS # SYNOPSIS
@ -44,7 +44,7 @@
# and this notice are preserved. This file is offered as-is, without any # and this notice are preserved. This file is offered as-is, without any
# warranty. # warranty.
#serial 10 #serial 14
AU_ALIAS([AC_JNI_INCLUDE_DIR], [AX_JNI_INCLUDE_DIR]) AU_ALIAS([AC_JNI_INCLUDE_DIR], [AX_JNI_INCLUDE_DIR])
AC_DEFUN([AX_JNI_INCLUDE_DIR],[ AC_DEFUN([AX_JNI_INCLUDE_DIR],[
@ -59,15 +59,23 @@ else
fi fi
AC_PATH_PROG([_ACJNI_JAVAC], [$JAVAC], [no]) AC_PATH_PROG([_ACJNI_JAVAC], [$JAVAC], [no])
if test "x$_ACJNI_JAVAC" = xno; then if test "x$_ACJNI_JAVAC" = xno; then
AC_MSG_WARN([cannot find JDK; try setting \$JAVAC or \$JAVA_HOME]) AC_MSG_ERROR([cannot find JDK; try setting \$JAVAC or \$JAVA_HOME])
fi fi
_ACJNI_FOLLOW_SYMLINKS("$_ACJNI_JAVAC") _ACJNI_FOLLOW_SYMLINKS("$_ACJNI_JAVAC")
_JTOPDIR=`echo "$_ACJNI_FOLLOWED" | sed -e 's://*:/:g' -e 's:/[[^/]]*$::'` _JTOPDIR=`echo "$_ACJNI_FOLLOWED" | sed -e 's://*:/:g' -e 's:/[[^/]]*$::'`
fi fi
case "$host_os" in case "$host_os" in
darwin*) _JTOPDIR=`echo "$_JTOPDIR" | sed -e 's:/[[^/]]*$::'` darwin*) # Apple Java headers are inside the Xcode bundle.
_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
;;
*) _JINC="$_JTOPDIR/include";; *) _JINC="$_JTOPDIR/include";;
esac esac
_AS_ECHO_LOG([_JTOPDIR=$_JTOPDIR]) _AS_ECHO_LOG([_JTOPDIR=$_JTOPDIR])
@ -76,13 +84,12 @@ _AS_ECHO_LOG([_JINC=$_JINC])
# On Mac OS X 10.6.4, jni.h is a symlink: # On Mac OS X 10.6.4, jni.h is a symlink:
# /System/Library/Frameworks/JavaVM.framework/Versions/Current/Headers/jni.h # /System/Library/Frameworks/JavaVM.framework/Versions/Current/Headers/jni.h
# -> ../../CurrentJDK/Headers/jni.h. # -> ../../CurrentJDK/Headers/jni.h.
AC_CACHE_CHECK(jni headers, ac_cv_jni_header_path, AC_CACHE_CHECK(jni headers, ac_cv_jni_header_path,
[ [
if test -f "$_JINC/jni.h"; then if test -f "$_JINC/jni.h"; then
ac_cv_jni_header_path="$_JINC" ac_cv_jni_header_path="$_JINC"
JNI_INCLUDE_DIRS="$JNI_INCLUDE_DIRS $ac_cv_jni_header_path" JNI_INCLUDE_DIRS="$JNI_INCLUDE_DIRS $ac_cv_jni_header_path"
else else
_JTOPDIR=`echo "$_JTOPDIR" | sed -e 's:/[[^/]]*$::'` _JTOPDIR=`echo "$_JTOPDIR" | sed -e 's:/[[^/]]*$::'`
if test -f "$_JTOPDIR/include/jni.h"; then if test -f "$_JTOPDIR/include/jni.h"; then
ac_cv_jni_header_path="$_JTOPDIR/include" ac_cv_jni_header_path="$_JTOPDIR/include"
@ -90,16 +97,14 @@ else
else else
ac_cv_jni_header_path=none ac_cv_jni_header_path=none
fi fi
fi fi
]) ])
# get the likely subdirectories for system specific java includes # get the likely subdirectories for system specific java includes
case "$host_os" in case "$host_os" in
bsdi*) _JNI_INC_SUBDIRS="bsdos";; bsdi*) _JNI_INC_SUBDIRS="bsdos";;
darwin*) _JNI_INC_SUBDIRS="darwin";;
freebsd*) _JNI_INC_SUBDIRS="freebsd";; freebsd*) _JNI_INC_SUBDIRS="freebsd";;
darwin*) _JNI_INC_SUBDIRS="darwin";;
linux*) _JNI_INC_SUBDIRS="linux genunix";; linux*) _JNI_INC_SUBDIRS="linux genunix";;
osf*) _JNI_INC_SUBDIRS="alpha";; osf*) _JNI_INC_SUBDIRS="alpha";;
solaris*) _JNI_INC_SUBDIRS="solaris";; solaris*) _JNI_INC_SUBDIRS="solaris";;