Don't point to non-existent directories in JAVA_LIB

6796128f · Tor Lillqvist · d199ce62 · 6796128f
Kaydet (Commit) 6796128f authored Ock 19, 2012 tarafından Tor Lillqvist
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

configure.in configure.in +4 -1

No files found.
--- 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)