From fa73b001aa1f2e7dce4e76f05d2a80a2ea2274d0 Mon Sep 17 00:00:00 2001
From: Mario Danic <mario@lovelyhq.com>
Date: Tue, 24 Apr 2007 22:54:05 +0000
Subject: [PATCH] Initial set of fixes for build system

---
 java/INSTALL       |  4 +++-
 java/build.xml     | 13 ++++++++-----
 java/config.log    | 17 ++++++++---------
 java/config.status |  4 ++--
 4 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/java/INSTALL b/java/INSTALL
index 8b7a984..7e59f79 100644
--- a/java/INSTALL
+++ b/java/INSTALL
@@ -14,7 +14,9 @@ The simplest way to compile this package is:
      Running `configure' might take a while.  While running, it prints
      some messages telling which features it is checking for.
 
-  2. Type `ant' to compile the package.
+  2. Type `ant' to compile the package. You need to add the cpptasks.jar to ant
+     classpath. Usually this can be done by copy that jar into ant lib dir.
+     cpptasks.jar can be downloaded from http://ant-contrib.sourceforge.net.
 
   3. Optionally, type `ant check' to run any self-tests that come with
      the package.
diff --git a/java/build.xml b/java/build.xml
index 4141535..e02048b 100644
--- a/java/build.xml
+++ b/java/build.xml
@@ -45,7 +45,7 @@
 	<property name="dist.jar" value="${package}-${version}.jar" />
 
 	<!-- === CC tasks ====================== -->
-	<property name="cc.jar" value="${libs}/cpptasks.jar"/>	
+	<property name="cc.jar" value="cpptasks.jar"/>	
 	<taskdef resource="cpptasks.tasks"
 	  	 	 classpath="${cc.jar}"
 	  		 loaderRef="cctasks"/>
@@ -247,20 +247,23 @@
 		
 		<mkdir dir="${build}"/>
 		
-		<patternset id="tar.commonfiles" includes="java-libburn/**"
+		<patternset id="tar.commonfiles" includes="**"
 			excludes="**/build/**, **/bin/**, **/*.back, **/*~,     
 			          **/*.sh, **/doc/api/**, **/autom4te.cache/**, 
-					  **/build.properties/**, **/.bzr**" />
+					  **/build.properties/**, **/.bzr**, configure" />
 		<!--
 		 .tar.gz distribution (with execution permissions for .sh files) 
 		-->
 		<delete file="${build}/${dist.tar}.tar.gz"/>
 		<tar tarfile="${build}/${dist.tar}.tar.gz" longfile="gnu" 
 			 compression="gzip">
-			<tarfileset dir="..">
+			<tarfileset prefix="${dist.tar}" dir=".">
 				<patternset refid="tar.commonfiles"/>
 			</tarfileset>
-			<tarfileset dir=".." mode="755" includes="java-libburn/**/*.sh"/>
+			<tarfileset prefix="${dist.tar}" mode="755" dir=".">
+				<patternset includes="**/*.sh" />
+				<patternset includes="configure" />
+			</tarfileset>
 		</tar>
 	</target>
 	
diff --git a/java/config.log b/java/config.log
index 652d813..52c84e0 100644
--- a/java/config.log
+++ b/java/config.log
@@ -12,9 +12,9 @@ generated by GNU Autoconf 2.60.  Invocation command line was
 
 hostname = mplaptop
 uname -m = i686
-uname -r = 2.6.17-10-generic
+uname -r = 2.6.20-15-generic
 uname -s = Linux
-uname -v = #2 SMP Fri Oct 13 18:45:35 UTC 2006
+uname -v = #2 SMP Sun Apr 15 07:36:31 UTC 2007
 
 /usr/bin/uname -p = unknown
 /bin/uname -X     = unknown
@@ -33,7 +33,6 @@ PATH: /usr/sbin
 PATH: /usr/bin
 PATH: /sbin
 PATH: /bin
-PATH: /usr/bin/X11
 PATH: /usr/games
 
 
@@ -42,8 +41,8 @@ PATH: /usr/games
 ## ----------- ##
 
 configure:1633: checking for javac
-configure:1651: found /usr/local/bin/javac
-configure:1663: result: /usr/local/bin/javac
+configure:1651: found /usr/bin/javac
+configure:1663: result: /usr/bin/javac
 configure:1673: checking for javah
 configure:1691: found /usr/bin/javah
 configure:1703: result: /usr/bin/javah
@@ -55,7 +54,7 @@ configure:1816: found /usr/bin/gcc
 configure:1827: result: gcc
 configure:2065: checking for C compiler version
 configure:2072: gcc --version >&5
-gcc (GCC) 4.1.2 20060928 (prerelease) (Ubuntu 4.1.1-13ubuntu5)
+gcc (GCC) 4.1.2 (Ubuntu 4.1.2-0ubuntu4)
 Copyright (C) 2006 Free Software Foundation, Inc.
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
@@ -66,7 +65,7 @@ Using built-in specs.
 Target: i486-linux-gnu
 Configured with: ../src/configure -v --enable-languages=c,c++,fortran,objc,obj-c++,treelang --prefix=/usr --enable-shared --with-system-zlib --libexecdir=/usr/lib --without-included-gettext --enable-threads=posix --enable-nls --program-suffix=-4.1 --enable-__cxa_atexit --enable-clocale=gnu --enable-libstdcxx-debug --enable-mpfr --enable-checking=release i486-linux-gnu
 Thread model: posix
-gcc version 4.1.2 20060928 (prerelease) (Ubuntu 4.1.1-13ubuntu5)
+gcc version 4.1.2 (Ubuntu 4.1.2-0ubuntu4)
 configure:2085: $? = 0
 configure:2092: gcc -V >&5
 gcc: '-V' option must have argument
@@ -153,7 +152,7 @@ ac_cv_env_target_alias_set=
 ac_cv_env_target_alias_value=
 ac_cv_objext=o
 ac_cv_path_JAR=/usr/bin/jar
-ac_cv_path_JAVAC=/usr/local/bin/javac
+ac_cv_path_JAVAC=/usr/bin/javac
 ac_cv_path_JAVAH=/usr/bin/javah
 ac_cv_prog_ac_ct_CC=gcc
 ac_cv_prog_cc_c89=
@@ -174,7 +173,7 @@ ECHO_T=''
 EXEEXT=''
 ISOFS_INCLUDE='/usr/local/include/libisofs'
 JAR='/usr/bin/jar'
-JAVAC='/usr/local/bin/javac'
+JAVAC='/usr/bin/javac'
 JAVAH='/usr/bin/javah'
 LDFLAGS=''
 LIBOBJS=''
diff --git a/java/config.status b/java/config.status
index 1457445..ed3e6e8 100644
--- a/java/config.status
+++ b/java/config.status
@@ -318,7 +318,7 @@ Copyright (C) 2006 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
-ac_pwd='/home/metalpain/Dados/workspace/java-libburn'
+ac_pwd='extras/java'
 srcdir='.'
 # If no file are specified by the user, then we need to provide default
 # value.  By we need to know if files were specified by the user.
@@ -489,7 +489,7 @@ s,@LIBS@,|#_!!_#|,g
 s,@build_alias@,|#_!!_#|,g
 s,@host_alias@,|#_!!_#|,g
 s,@target_alias@,|#_!!_#|,g
-s,@JAVAC@,|#_!!_#|/usr/local/bin/javac,g
+s,@JAVAC@,|#_!!_#|/usr/bin/javac,g
 s,@JAVAH@,|#_!!_#|/usr/bin/javah,g
 s,@JAR@,|#_!!_#|/usr/bin/jar,g
 s,@CC@,|#_!!_#|gcc,g