configure.in | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
New commits: commit 6796128fbeea7b2cd71e99123bf86b56c23efd18 Author: Tor Lillqvist <tlillqv...@suse.com> Date: Thu Jan 19 11:43:58 2012 +0200 Don't point to non-existent directories in JAVA_LIB diff --git a/configure.in b/configure.in index 50f895c..f9a889e 100644 --- a/configure.in +++ b/configure.in @@ -4989,7 +4989,10 @@ esac if test -n "$JAVA_ARCH" ; then JRE_BASE_DIR="$JAVA_HOME/jre/lib/$JAVA_ARCH" - JAVALIB="-L $JAVA_HOME/$LIB64 -L $JRE_BASE_DIR -L $JRE_BASE_DIR/$JAVA_TOOLKIT -L $JRE_BASE_DIR/native_thread" + JAVALIB="-L $JAVA_HOME/$LIB64" + test -d "$JRE_BASE_DIR" && JAVALIB="$JAVALIB -L $JRE_BASE_DIR" + test -d "$JRE_BASE_DIR/$JAVA_TOOLKIT" && JAVALIB="$JAVALIB -L $JRE_BASE_DIR/$JAVA_TOOLKIT" + test -d "$JRE_BASE_DIR/native_thread" && JAVALIB="$JAVALIB -L $JRE_BASE_DIR/native_thread" fi AC_SUBST(x_JAVALIB) commit d199ce626d491d6c95e467bad60b4bb1c8b9f8c0 Author: Tor Lillqvist <tlillqv...@suse.com> Date: Thu Jan 19 11:30:36 2012 +0200 Google calls armel just arm diff --git a/configure.in b/configure.in index 24d6652..50f895c 100644 --- a/configure.in +++ b/configure.in @@ -4927,7 +4927,7 @@ linux-androideabi*) case "$host_cpu" in - armel) + arm|armel) JAVA_ARCH="arm" JAVA_TOOLKIT="server" ;; _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits