Merge -r 1302703:1302704 & 1302704:1302705 from trunk onto the 0.23 branch. Fixes HADOOP-6924.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.23@1302710 13f79535-47bb-0310-9956-ffa450edef68

hadoop-common-project/hadoop-common/src/main/native/configure.ac

@@ -57,6 +57,8 @@ JNI_LDFLAGS=""
 if test $JAVA_HOME != ""
 then
   JNI_LDFLAGS="-L$JAVA_HOME/jre/lib/$OS_ARCH/server"
+  JVMSOPATH=`find $JAVA_HOME/jre/ -name libjvm.so | head -n 1`
+  JNI_LDFLAGS="$JNI_LDFLAGS -L`dirname $JVMSOPATH`"
 fi
 LDFLAGS="$LDFLAGS $JNI_LDFLAGS"
 AC_CHECK_LIB([jvm], [JNI_GetCreatedJavaVMs])