MAPREDUCE-2127. svn merge -c 1152068 from trunk

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

mapreduce/CHANGES.txt

@@ -587,6 +587,9 @@ Release 0.22.0 - Unreleased
     MAPREDUCE-2571. CombineFileInputFormat.getSplits throws a
     java.lang.ArrayStoreException. (Bochun Bai via todd)
 
+    MAPREDUCE-2127. mapreduce trunk builds are filing on hudson.
+    (Bruno Mahé via eli)
+
 Release 0.21.1 - Unreleased
 
   NEW FEATURES

mapreduce/src/c++/utils/m4/hadoop_utils.m4

@@ -51,8 +51,8 @@ AC_CHECK_HEADERS([pthread.h], [],
   AC_MSG_ERROR(Please check if you have installed the pthread library)) 
 AC_CHECK_LIB([pthread], [pthread_create], [], 
   AC_MSG_ERROR(Cannot find libpthread.so, please check))
-AC_CHECK_LIB([ssl], [HMAC_Init], [], 
-  AC_MSG_ERROR(Cannot find libssl.so, please check))
+AC_CHECK_LIB([crypto], [HMAC_Init], [], 
+  AC_MSG_ERROR(Cannot find libcrypto.so, please check))
 ])
 
 # define a macro for using hadoop pipes