X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=configure.ac;h=22af00ab825375be547ac85b93199839f7d76243;hp=19ae0ac8c877553d62ab77e919604252f17881a5;hb=f01096c4b42f9a4720ed0414826c2a283a992545;hpb=887b11f6b9c81b9f15348d54017e700ca7dc5e55

diff --git a/configure.ac b/configure.ac
index 19ae0ac8..22af00ab 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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])
@@ -56,10 +68,19 @@ if test "x$JVM_INCLUDE" = "xauto"; then
 	AC_MSG_RESULT([$JVM_INCLUDE])
 fi
 
+AC_SUBST(JVM_INCLUDE)
+
+AC_ARG_WITH(fat-dir, AS_HELP_STRING([--with-fat-dir=PATH],
+	    [Set the directory to install the 'fat' distribution files to (defaults to not installing)]),
+	    [FATDIR=$withval], [FATDIR=none])
+
+AM_CONDITIONAL(FATINSTALL, [test "x$FATDIR" != "xnone"])
+
+AC_SUBST(FATDIR)
+
 AC_PROG_CC
 AC_PROG_INSTALL
 AC_PROG_LN_S
-AC_PROG_RANLIB
 AC_PROG_LIBTOOL
 PKG_PROG_PKG_CONFIG
 
@@ -112,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
@@ -123,7 +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
 ])