Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

[fw/altos] / configure.ac

diff --git a/configure.ac b/configure.ac
index 4bf8f7fe5a874ae593f369d6297b56db34c44c58..ecaeab63b9890b152b61272a81c9f43a57486553 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -18,7 +18,7 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.57)
-AC_INIT([altos], 0.7.1)
+AC_INIT([altos], 0.8.1)
 AC_CONFIG_SRCDIR([src/ao.h])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE
@@ -36,6 +36,18 @@ AC_ARG_WITH(freetts, AS_HELP_STRING([--with-freetts=PATH],
 
 AC_SUBST(FREETTS)
 
+AC_ARG_WITH(jfreechart, AS_HELP_STRING([--with-jfreechart=PATH],
+       [Set jfreechart class path (default /usr/share/java)]),
+       [JFREECHART=$withval], [JFREECHART=/usr/share/java])
+
+AC_SUBST(JFREECHART)
+
+AC_ARG_WITH(jcommon, AS_HELP_STRING([--with-jcommon=PATH],
+       [Set jcommon class path (default /usr/share/java)]),
+       [JCOMMON=$withval], [JCOMMON=/usr/share/java])
+
+AC_SUBST(JCOMMON)
+
 AC_ARG_WITH(jvm, AS_HELP_STRING([--with-jvm-include=PATH],
        [Set jvm include path for jni builds (default searches in /usr/lib/jvm)]),
        [JVM_INCLUDE=$withval], [JVM_INCLUDE=auto])
@@ -121,6 +133,8 @@ PKG_CHECK_MODULES([SNDFILE], [sndfile])
 
 AC_OUTPUT([
 Makefile
+altosui/Makefile
+altosui/libaltos/Makefile
 ao-tools/Makefile
 ao-tools/lib/Makefile
 ao-tools/ao-rawload/Makefile
@@ -132,8 +146,6 @@ ao-tools/ao-list/Makefile
 ao-tools/ao-load/Makefile
 ao-tools/ao-postflight/Makefile
 ao-tools/ao-view/Makefile
-ao-tools/libaltos/Makefile
-ao-tools/altosui/Makefile
 ao-utils/Makefile
 src/Version
 ])