From 0353e52e5296ca44fc0dd17bbae1cbd47cc9789e Mon Sep 17 00:00:00 2001
From: jwallace <wallace.je@husky.neu.edu>
Date: Mon, 7 Oct 2013 12:45:54 -0400
Subject: [PATCH] Updated autotools configuration for building java bindings.
---
Makefile.am | 10 +++-------
bindings/java/Makefile.am | 4 +---
configure.ac | 3 +--
3 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index f630f287e..33390d34b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -62,13 +62,9 @@ if CPPUNIT
UNIT_TESTS=unit_tests
endif
-if X_ANT
- JAVA_BINDINGS=bindings/java
-else
- JAVA_BINDINGS=bindings/java/jni
-endif
-
-if !X_JNI
+if X_JNI
+ JAVA_BINDINGS=bindings/java/jni bindings/java
+else
JAVA_BINDINGS=
endif
diff --git a/bindings/java/Makefile.am b/bindings/java/Makefile.am
index 7b7d58f97..fa70d5ca8 100644
--- a/bindings/java/Makefile.am
+++ b/bindings/java/Makefile.am
@@ -1,5 +1,3 @@
-SUBDIRS = jni
-
Z_PATH=@Z_PATH@
EWF_PATH=@EWF_PATH@
ANT_PROPS=
@@ -13,7 +11,7 @@ if X_LIBEWF
endif
tsk_jar = $(top_builddir)/bindings/java/dist/Tsk_DataModel.jar
-jardir = /usr/share/java
+jardir = $(prefix)/share/java
jar_DATA = $(tsk_jar)
diff --git a/configure.ac b/configure.ac
index 2c34b7a63..20ae55f79 100644
--- a/configure.ac
+++ b/configure.ac
@@ -218,11 +218,10 @@ AS_IF([test "x$enable_java" != "xno"], [
AC_SUBST(JNI_CPPFLAGS, $JNI_CPPFLAGS)
fi
]) # test enable_java
-AM_CONDITIONAL([X_JNI],[test "x$JNI_CPPFLAGS" != x])
# Test is ant is available
AC_PATH_PROG([ANT_FOUND], [ant], [])
-AM_CONDITIONAL([X_ANT],[test "x$ANT_FOUND" != x])
+AM_CONDITIONAL([X_JNI],[test "x$JNI_CPPFLAGS" != x && test "x$ANT_FOUND" != x])
AC_CONFIG_COMMANDS([tsk/tsk_incs.h],
[
--
GitLab