Revert HADOOP-4949.

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

CHANGES.txt

@@ -503,8 +503,6 @@ Release 0.20.0 - Unreleased
     HADOOP-4956. Creates TaskStatus for failed tasks with an empty Counters 
     object instead of null. (ddas)
 
-    HADOOP-4949. Fix native compilation. (Chris Douglas via rangadi)
-
     HADOOP-4979. Fix capacity scheduler to block cluster for failed high
     RAM requirements across task types. (Vivek Ratan via yhemanth)
 

build.xml

@@ -456,6 +456,7 @@
   	
     <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}"
@@ -467,6 +468,16 @@
       <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 lib 
+SUBDIRS = src/org/apache/hadoop/io/compress/zlib
 
 # The following export is needed to build libhadoop.so in the 'lib' directory
 export SUBDIRS