From: Paul Brossier <piem@piem.org>
Date: Wed, 30 Apr 2008 18:47:48 +0000 (+0200)
Subject: Makefile.am, configure.ac: go down into java and tests, make java compilation somewha... 
X-Git-Tag: bzr2git~397
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=fcc3fd253647d068e5a4cd3a354b0766fee6e75c;p=aubio.git

Makefile.am, configure.ac: go down into java and tests, make java compilation somewhat conditional (needs improvements)
---

diff --git a/Makefile.am b/Makefile.am
index 3993669a..cf6dfaa5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,8 +8,12 @@ if PYTHONFOUND
 PYTHONDIR = python
 endif
 endif
+if JAVAFOUND
+JAVADIR = java
+endif
+
 
-SUBDIRS = src ext cpp examples sounds plugins $(PYTHONDIR) $(SWIGDIR) $(DOC)
+SUBDIRS = src ext cpp examples sounds plugins $(PYTHONDIR) $(SWIGDIR) $(JAVADIR) $(DOC) tests
 EXTRA_DIST = bootstrap VERSION
 
 docs:
diff --git a/configure.ac b/configure.ac
index 2e2a8e43..3fcdf0ed 100644
--- a/configure.ac
+++ b/configure.ac
@@ -245,6 +245,10 @@ dnl Check for Puredata
 AC_CHECK_HEADER(m_pd.h,PUREDATA=y,AC_MSG_WARN([Puredata header not found.]))
 AM_CONDITIONAL(PUREDATAFOUND, test "${PUREDATA}" = "y")
 
+dnl Check for Java
+AC_CHECK_HEADER(jni.h,JAVAHEADERS=y,AC_MSG_WARN([Java header jni.h not found.]))
+AM_CONDITIONAL(JAVAFOUND, test "${JAVAHEADERS}" = "y")
+
 dnl Create Makefiles
 AC_OUTPUT([
     Makefile