Updated autotools configuration for building java bindings.

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
 

bindings/java/Makefile.am

-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)
 
 

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],
         [