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

diff --git a/altosui/Makefile.am b/altosui/Makefile.am
index 9f75d5e38dd2decb1f1841deda959e7f6bbde2b2..0482029477a143f1843ba3cd64852cd99e2e6ae4 100644 (file)
--- 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 8ce94180aa690e696becb3cdc6d131dbc1064e15..8b0026628de883d996401a3ac9213b0013685f20 100644 (file)
--- 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