summaryrefslogtreecommitdiff
path: root/configure.in
diff options
context:
space:
mode:
authorTor Lillqvist <tlillqvist@suse.com>2012-01-19 11:43:58 +0200
committerTor Lillqvist <tlillqvist@suse.com>2012-01-19 11:43:58 +0200
commit6796128fbeea7b2cd71e99123bf86b56c23efd18 (patch)
tree56b93608c16bb04ed5b4b7f9ef22c2b90bcef69f /configure.in
parentd199ce626d491d6c95e467bad60b4bb1c8b9f8c0 (diff)
Don't point to non-existent directories in JAVA_LIB
Diffstat (limited to 'configure.in')
-rw-r--r--configure.in5
1 files changed, 4 insertions, 1 deletions
diff --git a/configure.in b/configure.in
index 50f895c447a2..f9a889e42563 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)