diff options
| author | Tom Marble <tmarble@info9.net> | 2012-09-11 22:48:04 -0500 |
|---|---|---|
| committer | Tom Marble <tmarble@info9.net> | 2012-09-11 22:48:04 -0500 |
| commit | 11fbcf5e30e0cd09f2d6b448911d2ef62b7f29c7 (patch) | |
| tree | dfba7a44edf6a2807233955d463af33527221676 | |
| parent | 95268d681c9a6652d84db383f55a4fe8a4ac5173 (diff) | |
Added the feature to AC to default --with-android to $ANDROID_SDK (if set)
Fixed typos in altosui/Makefile.am (had removed JCOMMON, but it's from AC)
Jenkins changes:
- added android sdk
- will now record artifacts: altoslib/AltosLib.jar,altosui/altosui.jar,**/*.apk
| -rw-r--r-- | altosui/Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 2 |
2 files changed, 2 insertions, 2 deletions
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 |