From: Tom Marble Date: Wed, 12 Sep 2012 03:50:18 +0000 (-0500) Subject: Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos X-Git-Tag: 1.1~5^2~2 X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=4563624638884b7b2f16cd4d396c00690e045999;hp=e5a55dbf265354e7c94be3e2be53c2d5c8fba056 Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos --- diff --git a/altosui/Makefile.am b/altosui/Makefile.am index 9f75d5e3..04820294 100644 --- a/altosui/Makefile.am +++ b/altosui/Makefile.am @@ -6,7 +6,7 @@ man_MANS=altosui.1 altoslibdir=$(libdir)/altos -CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH=".:classes:../altoslib/*:libaltos::$(JFREECHART)/jfreechart.jar:$(FREETTS)/freetts.jar" +CLASSPATH_ENV=mkdir -p $(JAVAROOT); CLASSPATH=".:classes:../altoslib/*:libaltos:$(JCOMMON)/jcommon.jar:$(JFREECHART)/jfreechart.jar:$(FREETTS)/freetts.jar" bin_SCRIPTS=altosui diff --git a/configure.ac b/configure.ac index 8ce94180..8b002662 100644 --- a/configure.ac +++ b/configure.ac @@ -72,7 +72,7 @@ AC_SUBST(JVM_INCLUDE) AC_ARG_WITH(android, AS_HELP_STRING([--with-android=PATH], [Set android SDK path (default searches in a variety of places)]), - [ANDROID_SDK=$withval], [ANDROID_SDK=auto]) + [ANDROID_SDK=$withval], [ANDROID_SDK=${ANDROID_SDK:-auto}]) echo ANDROID_SDK set to $ANDROID_SDK