Commit f078ae16ce09c692667ceabde06915247b05ac41
1 parent
9bf93ad9
Exists in
master
Atualizando detecção de java para funcionar com a versão mais nova sob OpenSUSE 12.1
Showing
2 changed files
with
3 additions
and
3 deletions
Show diff stats
latest/configure.ac
... | ... | @@ -298,7 +298,7 @@ esac |
298 | 298 | |
299 | 299 | # Check for JDK_HOME |
300 | 300 | if test "_$JDK_HOME" = "_" ; then |
301 | - AC_CHECK_FILE("/usr/lib/jvm/java-6-sun/bin/javac",JDK_HOME="/usr/lib/jvm/java-6-sun",) | |
301 | + AC_CHECK_FILE("/usr/java/default/bin/javac",JDK_HOME="/usr/java/default",) | |
302 | 302 | fi |
303 | 303 | |
304 | 304 | if test "_$JDK_HOME" = "_" ; then | ... | ... |
latest/src/jni/Makefile.in
... | ... | @@ -96,12 +96,12 @@ $(OBJRLS)/%@OBJEXT@: %.c |
96 | 96 | %.class: %.java |
97 | 97 | @echo $< ... |
98 | 98 | @mkdir -p `dirname $@` |
99 | - @$(JAVAC) -cp bin/java -sourcepath `dirname $^` -d `dirname $@` $^ | |
99 | + @$(JAVAC) -encoding utf-8 -cp bin/java -sourcepath `dirname $^` -d `dirname $@` $^ | |
100 | 100 | |
101 | 101 | $(BINDIR)/java/$(PACKAGE)/%.class: %.java |
102 | 102 | @echo $< ... |
103 | 103 | @mkdir -p `dirname $@` |
104 | - @$(JAVAC) -cp $(BINDIR)/java -sourcepath $(PWD) -d $(BINDIR)/java $^ | |
104 | + @$(JAVAC) -encoding utf-8 -cp $(BINDIR)/java -sourcepath $(PWD) -d $(BINDIR)/java $^ | |
105 | 105 | |
106 | 106 | lib3270_jni.h: $(BINDIR)/java/$(PACKAGE)/terminal.class |
107 | 107 | @echo $< ... | ... | ... |