shithub: aubio

Info  •  Files  •  Log  •  Branches

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

--- a/Makefile.am

+++ b/Makefile.am

@@ -8,8 +8,12 @@

 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:

--- a/configure.ac

+++ b/configure.ac

@@ -245,6 +245,10 @@

 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