From 606f9bca4ff68b7095b7371601788eb15ce0520f Mon Sep 17 00:00:00 2001
From: jwallace <wallace.je@husky.neu.edu>
Date: Thu, 26 Sep 2013 17:06:22 -0400
Subject: [PATCH] Added tests in configuration for ant.
---
Makefile.am | 12 ++++++++++--
configure.ac | 4 ++++
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 1ab01b51e..f630f287e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -61,9 +61,17 @@ ACLOCAL_AMFLAGS = -I m4
if CPPUNIT
UNIT_TESTS=unit_tests
endif
-if X_JNI
- JAVA_BINDINGS=bindings/java/
+
+if X_ANT
+ JAVA_BINDINGS=bindings/java
+else
+ JAVA_BINDINGS=bindings/java/jni
+endif
+
+if !X_JNI
+ JAVA_BINDINGS=
endif
+
SUBDIRS = tsk tools tests samples man $(UNIT_TESTS) $(JAVA_BINDINGS)
nobase_include_HEADERS = tsk/libtsk.h tsk/tsk_incs.h \
diff --git a/configure.ac b/configure.ac
index 83ac6b25a..8d6ed482c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -202,6 +202,10 @@ if test "x$JAVAC" != x; then
fi
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])
+
AC_CONFIG_COMMANDS([tsk/tsk_incs.h],
[
echo "#ifndef _TSK_INCS_H" > tsk/tsk_incs.h
--
GitLab