Author: ddas Date: Mon Mar 19 23:15:34 2012 New Revision: 1302710 URL: http://svn.apache.org/viewvc?rev=1302710&view=rev Log: Merge -r 1302703:1302704 & 1302704:1302705 from trunk onto the 0.23 branch. Fixes HADOOP-6924.
Modified: hadoop/common/branches/branch-0.23/hadoop-common-project/ (props changed) hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-auth/ (props changed) hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/ (props changed) hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt (props changed) hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/docs/ (props changed) hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/ (props changed) hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/native/configure.ac hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/core/ (props changed) Propchange: hadoop/common/branches/branch-0.23/hadoop-common-project/ ------------------------------------------------------------------------------ Merged /hadoop/common/trunk/hadoop-common-project:r1302704-1302705 Propchange: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-auth/ ------------------------------------------------------------------------------ Merged /hadoop/common/trunk/hadoop-common-project/hadoop-auth:r1302704-1302705 Propchange: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/ ------------------------------------------------------------------------------ Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common:r1302704-1302705 Propchange: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/CHANGES.txt ------------------------------------------------------------------------------ Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/CHANGES.txt:r1302704-1302705 Propchange: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/docs/ ------------------------------------------------------------------------------ Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/docs:r1302704-1302705 Propchange: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/java/ ------------------------------------------------------------------------------ Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/main/java:r1302704-1302705 Modified: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/native/configure.ac URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/native/configure.ac?rev=1302710&r1=1302709&r2=1302710&view=diff ============================================================================== --- hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/native/configure.ac (original) +++ hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/main/native/configure.ac Mon Mar 19 23:15:34 2012 @@ -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]) Propchange: hadoop/common/branches/branch-0.23/hadoop-common-project/hadoop-common/src/test/core/ ------------------------------------------------------------------------------ Merged /hadoop/common/trunk/hadoop-common-project/hadoop-common/src/test/core:r1302704-1302705