From f078ae16ce09c692667ceabde06915247b05ac41 Mon Sep 17 00:00:00 2001 From: perry.werneck@gmail.com Date: Mon, 16 Jan 2012 11:05:56 +0000 Subject: [PATCH] Atualizando detecção de java para funcionar com a versão mais nova sob OpenSUSE 12.1 --- latest/configure.ac | 2 +- latest/src/jni/Makefile.in | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/latest/configure.ac b/latest/configure.ac index 09602da..4b2e6ae 100644 --- a/latest/configure.ac +++ b/latest/configure.ac @@ -298,7 +298,7 @@ esac # Check for JDK_HOME if test "_$JDK_HOME" = "_" ; then - AC_CHECK_FILE("/usr/lib/jvm/java-6-sun/bin/javac",JDK_HOME="/usr/lib/jvm/java-6-sun",) + AC_CHECK_FILE("/usr/java/default/bin/javac",JDK_HOME="/usr/java/default",) fi if test "_$JDK_HOME" = "_" ; then diff --git a/latest/src/jni/Makefile.in b/latest/src/jni/Makefile.in index 7a61924..59f7814 100644 --- a/latest/src/jni/Makefile.in +++ b/latest/src/jni/Makefile.in @@ -96,12 +96,12 @@ $(OBJRLS)/%@OBJEXT@: %.c %.class: %.java @echo $< ... @mkdir -p `dirname $@` - @$(JAVAC) -cp bin/java -sourcepath `dirname $^` -d `dirname $@` $^ + @$(JAVAC) -encoding utf-8 -cp bin/java -sourcepath `dirname $^` -d `dirname $@` $^ $(BINDIR)/java/$(PACKAGE)/%.class: %.java @echo $< ... @mkdir -p `dirname $@` - @$(JAVAC) -cp $(BINDIR)/java -sourcepath $(PWD) -d $(BINDIR)/java $^ + @$(JAVAC) -encoding utf-8 -cp $(BINDIR)/java -sourcepath $(PWD) -d $(BINDIR)/java $^ lib3270_jni.h: $(BINDIR)/java/$(PACKAGE)/terminal.class @echo $< ... -- libgit2 0.21.2