Merge pull request #26 from michael-o/freebsd

Improve FreeBSD support
fusesource · Jun 20, 2016 · e2522b0 · e2522b0
2 parents 63f30ef + 6dc93fe
commit e2522b0
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/maven-hawtjni-plugin/src/main/resources/project-template/m4/jni.m4 b/maven-hawtjni-plugin/src/main/resources/project-template/m4/jni.m4
@@ -64,6 +64,7 @@ AC_DEFUN([WITH_JNI_JDK],
       AS_IF(test -z "$JNI_JDK", [
         case "$host_os" in
            darwin*) __JNI_GUESS="/System/Library/Frameworks/JavaVM.framework";;
+          freebsd*) __JNI_GUESS=$(env JAVAVM_DRYRUN=yes /usr/local/bin/java | grep '^JAVA_HOME' | cut -c11-);;
                  *) __JNI_GUESS="/usr";;
         esac
         AC_MSG_NOTICE([Taking a guess as to where your OS installs the JDK by default...])
@@ -107,7 +108,7 @@ AC_DEFUN([CHECK_JNI_JDK],[
     __JNI_CFLAGS="-I$__JNI_INCLUDE"
     case "$host_os" in
        darwin*) __JNI_INCLUDE_EXTRAS="darwin";;
-         bsdi*) __JNI_INCLUDE_EXTRAS="bsdos";;
+      freebsd*) __JNI_INCLUDE_EXTRAS="freebsd";;
         linux*) __JNI_INCLUDE_EXTRAS="linux genunix";;
           osf*) __JNI_INCLUDE_EXTRAS="alpha";;
       solaris*) __JNI_INCLUDE_EXTRAS="solaris";;