diff options
| author | Jakob Odersky <jodersky@gmail.com> | 2015-09-25 18:45:10 +0200 |
|---|---|---|
| committer | Jakob Odersky <jodersky@gmail.com> | 2015-09-25 18:45:10 +0200 |
| commit | 7a785d1560f9aea79d5738e81b554ae77b676dd9 (patch) | |
| tree | 2447cbb0866504190296113fb09402a14a40b461 | |
| parent | 30865f1adc14c2b772c57904effc3537dd730691 (diff) | |
| parent | b19afd46f5953b08c8eb599fbde772643d760d32 (diff) | |
| download | akka-serial-7a785d1560f9aea79d5738e81b554ae77b676dd9.tar.gz akka-serial-7a785d1560f9aea79d5738e81b554ae77b676dd9.tar.bz2 akka-serial-7a785d1560f9aea79d5738e81b554ae77b676dd9.zip | |
Merge pull request #19 from jodersky/fix-17
configure.ac: change search paths for JNI headers on OSX
| -rw-r--r-- | Documentation/building.md | 5 | ||||
| -rw-r--r-- | flow-native/m4/ax_jni_include_dir.m4 | 8 |
2 files changed, 6 insertions, 7 deletions
diff --git a/Documentation/building.md b/Documentation/building.md index 24d14de..d604976 100644 --- a/Documentation/building.md +++ b/Documentation/building.md @@ -39,8 +39,9 @@ Several steps are involved in producing the native library: 2. Compile - 1. Check availability of dependencies: C compiler and JDK - 2. Run `./configure && make` + 1. Check availability of dependencies: C compiler and JDK (1.7 or above) + 2. Run `./configure && make`. + *Note: should you encounter an error about a missing "jni.h" file, try setting the JAVA_HOME environment variable to point to base path of your JDK installation.* 3. Install diff --git a/flow-native/m4/ax_jni_include_dir.m4 b/flow-native/m4/ax_jni_include_dir.m4 index 99850bf..20fa380 100644 --- a/flow-native/m4/ax_jni_include_dir.m4 +++ b/flow-native/m4/ax_jni_include_dir.m4 @@ -65,11 +65,8 @@ else _JTOPDIR=`echo "$_ACJNI_FOLLOWED" | sed -e 's://*:/:g' -e 's:/[[^/]]*$::'` fi -case "$host_os" in - darwin*) _JTOPDIR=`echo "$_JTOPDIR" | sed -e 's:/[[^/]]*$::'` - _JINC="$_JTOPDIR/Headers";; - *) _JINC="$_JTOPDIR/include";; -esac +_JINC="$_JTOPDIR/include" + _AS_ECHO_LOG([_JTOPDIR=$_JTOPDIR]) _AS_ECHO_LOG([_JINC=$_JINC]) @@ -93,6 +90,7 @@ osf*) _JNI_INC_SUBDIRS="alpha";; solaris*) _JNI_INC_SUBDIRS="solaris";; mingw*) _JNI_INC_SUBDIRS="win32";; cygwin*) _JNI_INC_SUBDIRS="win32";; +darwin*) _JNI_INC_SUBDIRS="darwin";; *) _JNI_INC_SUBDIRS="genunix";; esac |