浏览代码

HADOOP-2352. Remove AC_CHECK_LIB for libz and liblzo to ensure that libhadoop.so doesn't have a dependency on them.

git-svn-id: https://svn.apache.org/repos/asf/lucene/hadoop/trunk@605672 13f79535-47bb-0310-9956-ffa450edef68
Arun Murthy 17 年之前
父节点
当前提交
8418237f7a
共有 4 个文件被更改,包括 163 次插入616 次删除
  1. 6 0
      CHANGES.txt
  2. 0 6
      src/native/config.h.in
  3. 157 604
      src/native/configure
  4. 0 6
      src/native/configure.ac

+ 6 - 0
CHANGES.txt

@@ -264,6 +264,12 @@ Trunk (unreleased changes)
     been superceeded by mapred.tasktracker.{map|reduce}.tasks.maximum. 
     been superceeded by mapred.tasktracker.{map|reduce}.tasks.maximum. 
     (Amareshwari Sri Ramadasu via acmurthy)
     (Amareshwari Sri Ramadasu via acmurthy)
 
 
+    HADOOP-2459. Fix package target so that src/docs/build files are not
+    included in the release.  (nigel)
+
+    HADOOP-2352. Remove AC_CHECK_LIB for libz and liblzo to ensure that
+    libhadoop.so doesn't have a dependency on them. (acmurthy) 
+
 Branch 0.15 (unreleased)
 Branch 0.15 (unreleased)
 
 
   BUG FIXES
   BUG FIXES

+ 0 - 6
src/native/config.h.in

@@ -21,12 +21,6 @@
 /* Define to 1 if you have the `jvm' library (-ljvm). */
 /* Define to 1 if you have the `jvm' library (-ljvm). */
 #undef HAVE_LIBJVM
 #undef HAVE_LIBJVM
 
 
-/* Define to 1 if you have the `lzo2' library (-llzo2). */
-#undef HAVE_LIBLZO2
-
-/* Define to 1 if you have the `z' library (-lz). */
-#undef HAVE_LIBZ
-
 /* Define to 1 if you have the <lzo/lzo1a.h> header file. */
 /* Define to 1 if you have the <lzo/lzo1a.h> header file. */
 #undef HAVE_LZO_LZO1A_H
 #undef HAVE_LZO_LZO1A_H
 
 

文件差异内容过多而无法显示
+ 157 - 604
src/native/configure


+ 0 - 6
src/native/configure.ac

@@ -61,12 +61,6 @@ AC_CHECK_LIB([jvm], [JNI_GetCreatedJavaVMs])
 LDFLAGS=$ldflags_bak
 LDFLAGS=$ldflags_bak
 AC_SUBST([JNI_LDFLAGS])
 AC_SUBST([JNI_LDFLAGS])
 
 
-dnl Check for '-lz'
-AC_CHECK_LIB([z], [deflate])
-
-dnl Check for '-llzo2'
-AC_CHECK_LIB([lzo2], [lzo_init])
-
 # Checks for header files.
 # Checks for header files.
 dnl Check for Ansi C headers
 dnl Check for Ansi C headers
 AC_HEADER_STDC
 AC_HEADER_STDC

部分文件因为文件数量过多而无法显示