Return-Path: 
 <core-commits-return-7333-apmail-hadoop-core-commits-archive=hadoop.apache.org@hadoop.apache.org>
Delivered-To: apmail-hadoop-core-commits-archive@www.apache.org
Received: (qmail 33527 invoked from network); 2 Jan 2009 17:34:25 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 2 Jan 2009 17:34:25 -0000
Received: (qmail 1255 invoked by uid 500); 2 Jan 2009 17:34:24 -0000
Delivered-To: apmail-hadoop-core-commits-archive@hadoop.apache.org
Received: (qmail 1219 invoked by uid 500); 2 Jan 2009 17:34:24 -0000
Mailing-List: contact core-commits-help@hadoop.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:core-commits-help@hadoop.apache.org>
List-Unsubscribe: <mailto:core-commits-unsubscribe@hadoop.apache.org>
List-Post: <mailto:core-commits@hadoop.apache.org>
List-Id: <core-commits.hadoop.apache.org>
Reply-To: core-dev@hadoop.apache.org
Delivered-To: mailing list core-commits@hadoop.apache.org
Received: (qmail 1210 invoked by uid 99); 2 Jan 2009 17:34:24 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Jan 2009 09:34:24 -0800
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 Jan 2009 17:34:23 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 9031623889C0; Fri,  2 Jan 2009 09:34:03 -0800 (PST)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r730794 [1/2] - in /hadoop/core/trunk: CHANGES.txt
 build.xml
 src/native/Makefile.am src/native/aclocal.m4
Date: Fri, 02 Jan 2009 17:34:03 -0000
To: core-commits@hadoop.apache.org
From: rangadi@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20090102173403.9031623889C0@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: rangadi
Date: Fri Jan  2 09:34:02 2009
New Revision: 730794

URL: http://svn.apache.org/viewvc?rev=730794&view=rev
Log:
HADOOP-4949. Fix native compilation. (Chris Douglas via rangadi)

Modified:
    hadoop/core/trunk/CHANGES.txt
    hadoop/core/trunk/build.xml
    hadoop/core/trunk/src/native/Makefile.am
    hadoop/core/trunk/src/native/aclocal.m4

Modified: hadoop/core/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/CHANGES.txt?rev=730794&r1=730793&r2=730794&view=diff
==============================================================================
--- hadoop/core/trunk/CHANGES.txt (original)
+++ hadoop/core/trunk/CHANGES.txt Fri Jan  2 09:34:02 2009
@@ -525,6 +525,8 @@
     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)
+
 Release 0.19.1 - Unreleased
 
   IMPROVEMENTS

Modified: hadoop/core/trunk/build.xml
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/build.xml?rev=730794&r1=730793&r2=730794&view=diff
==============================================================================
--- hadoop/core/trunk/build.xml (original)
+++ hadoop/core/trunk/build.xml Fri Jan  2 09:34:02 2009
@@ -455,7 +455,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}"
@@ -467,16 +466,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}"/>

Modified: hadoop/core/trunk/src/native/Makefile.am
URL: http://svn.apache.org/viewvc/hadoop/core/trunk/src/native/Makefile.am?rev=730794&r1=730793&r2=730794&view=diff
==============================================================================
--- hadoop/core/trunk/src/native/Makefile.am (original)
+++ hadoop/core/trunk/src/native/Makefile.am Fri Jan  2 09:34:02 2009
@@ -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