Merge -r 732384:732385 from trunk to branch-0.20 to fix HADOOP-4949.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/core/branches/branch-0.20@732389 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -506,6 +506,8 @@ Release 0.20.0 - Unreleased
     HADOOP-4979. Fix capacity scheduler to block cluster for failed high
     RAM requirements across task types. (Vivek Ratan via yhemanth)
 
+    HADOOP-4949. Fix native compilation. (Chris Douglas via acmurthy) 
+
 Release 0.19.1 - Unreleased
 
   IMPROVEMENTS

build.xml

@@ -456,7 +456,6 @@
   	
     <mkdir dir="${build.native}/lib"/>
     <mkdir dir="${build.native}/src/org/apache/hadoop/io/compress/zlib"/>
-    <mkdir dir="${build.native}/src/org/apache/hadoop/io/compress/lzo"/>
 
   	<javah
   	  classpath="${build.classes}"
@@ -468,16 +467,6 @@
       <class name="org.apache.hadoop.io.compress.zlib.ZlibDecompressor" />
   	</javah>
 
-  	<javah
-  	  classpath="${build.classes}"
-  	  destdir="${build.native}/src/org/apache/hadoop/io/compress/lzo"
-      force="yes"
-  	  verbose="yes"
-  	  >
-  	  <class name="org.apache.hadoop.io.compress.lzo.LzoCompressor" />
-      <class name="org.apache.hadoop.io.compress.lzo.LzoDecompressor" />
-  	</javah>
-
 	<exec dir="${build.native}" executable="sh" failonerror="true">
 	  <env key="OS_NAME" value="${os.name}"/>
 	  <env key="OS_ARCH" value="${os.arch}"/>

src/native/Makefile.am

@@ -36,7 +36,7 @@
 export PLATFORM = $(shell echo $$OS_NAME | tr [A-Z] [a-z])
 
 # List the sub-directories here
-SUBDIRS = src/org/apache/hadoop/io/compress/zlib
+SUBDIRS = src/org/apache/hadoop/io/compress/zlib lib
 
 # The following export is needed to build libhadoop.so in the 'lib' directory
 export SUBDIRS

src/native/Makefile.in

@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -67,6 +67,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
 DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
@@ -206,7 +207,7 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 
 # List the sub-directories here
-SUBDIRS = src/org/apache/hadoop/io/compress/zlib
+SUBDIRS = src/org/apache/hadoop/io/compress/zlib lib
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 

src/native/lib/Makefile.in

@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -68,6 +68,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
 subdir = lib
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in

src/native/src/org/apache/hadoop/io/compress/zlib/Makefile.in

@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.9 from Makefile.am.
+# Makefile.in generated by automake 1.9.2 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
@@ -72,6 +72,7 @@ POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
+build_triplet = @build@
 host_triplet = @host@
 subdir = src/org/apache/hadoop/io/compress/zlib
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in