diff options
| author | Jakob Odersky <jodersky@gmail.com> | 2015-09-25 18:28:53 +0200 |
|---|---|---|
| committer | Jakob Odersky <jodersky@gmail.com> | 2015-09-25 18:39:47 +0200 |
| commit | b19afd46f5953b08c8eb599fbde772643d760d32 (patch) | |
| tree | 2447cbb0866504190296113fb09402a14a40b461 /flow-native | |
| parent | 30865f1adc14c2b772c57904effc3537dd730691 (diff) | |
| download | akka-serial-b19afd46f5953b08c8eb599fbde772643d760d32.tar.gz akka-serial-b19afd46f5953b08c8eb599fbde772643d760d32.tar.bz2 akka-serial-b19afd46f5953b08c8eb599fbde772643d760d32.zip | |
configure.ac: change search paths for JNI headers on OSX
* requires JDK 1.7+
* fixes #17
Diffstat (limited to 'flow-native')
| -rw-r--r-- | flow-native/m4/ax_jni_include_dir.m4 | 8 |
1 files changed, 3 insertions, 5 deletions
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 |