[kaffe] CVS kaffe (robilad): build fix for using internal zlib

[Kaffe CVS]

PatchSet 7166 
Date: 2006/03/24 05:29:30
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
build fix for using internal zlib

2006-03-23  Dalibor Topic  <robilad at kaffe.org>

        * libraries/clib/zip/Makefile.am (MAYBE_INTERNAL_ZIP_INCLUDES):
        Fixed the path to bundled zlib.

Members: 
	ChangeLog:1.4684->1.4685 
	developers/test-kaffe-sh:1.1->1.2 
	libraries/clib/zip/Makefile.am:1.14->1.15 
	libraries/clib/zip/Makefile.in:1.169->1.170 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4684 kaffe/ChangeLog:1.4685
--- kaffe/ChangeLog:1.4684	Thu Mar 23 23:24:52 2006
+++ kaffe/ChangeLog	Fri Mar 24 05:29:30 2006
@@ -5,6 +5,11 @@
 
 2006-03-23  Dalibor Topic  <robilad at kaffe.org>
 
+	* libraries/clib/zip/Makefile.am (MAYBE_INTERNAL_ZIP_INCLUDES):
+	Fixed the path to bundled zlib. 
+
+2006-03-23  Dalibor Topic  <robilad at kaffe.org>
+
 	* config/Makfile.am: (EXTRA_DIST) Renamed blackfin jitter
 	files to match the actual names of files. Fixes make distcheck.
 
Index: kaffe/developers/test-kaffe-sh
diff -u kaffe/developers/test-kaffe-sh:1.1 kaffe/developers/test-kaffe-sh:1.2
--- kaffe/developers/test-kaffe-sh:1.1	Wed Dec 28 21:33:40 2005
+++ kaffe/developers/test-kaffe-sh	Fri Mar 24 05:29:35 2006
@@ -45,7 +45,7 @@
 
 /tmp/kaffe/bin/tar xvf ~/kaffe*.tar
 
-KVER=/tmp/kaffe/kaffe-1.1.6+cvs
+KVER=/tmp/kaffe/kaffe-1.1.7-rc1
 DEFAULT="--disable-boehm-gc-configuration --disable-sound --disable-native-awt --enable-pure-java-math --with-jikes=/tmp/kaffe/bin/jikes --disable-gtk-peer"
 
 ENG=intrp
Index: kaffe/libraries/clib/zip/Makefile.am
diff -u kaffe/libraries/clib/zip/Makefile.am:1.14 kaffe/libraries/clib/zip/Makefile.am:1.15
--- kaffe/libraries/clib/zip/Makefile.am:1.14	Tue Jan  3 15:27:48 2006
+++ kaffe/libraries/clib/zip/Makefile.am	Fri Mar 24 05:29:35 2006
@@ -10,7 +10,7 @@
 LINKED_ZIP_LIBS=$(ZIP_LIBS)
 else
 LINKED_ZIP_LIBS=../../../external/gcc/zlib/libz.la
-MAYBE_INTERNAL_ZIP_INCLUDES=-I../../../external/gcc/zlib/
+MAYBE_INTERNAL_ZIP_INCLUDES=-I$(srcdir)/../../../external/gcc/zlib/
 endif
 
 AM_CPPFLAGS = \
Index: kaffe/libraries/clib/zip/Makefile.in
diff -u kaffe/libraries/clib/zip/Makefile.in:1.169 kaffe/libraries/clib/zip/Makefile.in:1.170
--- kaffe/libraries/clib/zip/Makefile.in:1.169	Tue Feb  7 21:48:03 2006
+++ kaffe/libraries/clib/zip/Makefile.in	Fri Mar 24 05:29:35 2006
@@ -379,7 +379,7 @@
 with_engine = @with_engine@
 @COND_SYSTEM_ZLIB_FALSE at LINKED_ZIP_LIBS = ../../../external/gcc/zlib/libz.la
 @COND_SYSTEM_ZLIB_TRUE at LINKED_ZIP_LIBS = $(ZIP_LIBS)
- at COND_SYSTEM_ZLIB_FALSE@MAYBE_INTERNAL_ZIP_INCLUDES = -I../../../external/gcc/zlib/
+ at COND_SYSTEM_ZLIB_FALSE@MAYBE_INTERNAL_ZIP_INCLUDES = -I$(srcdir)/../../../external/gcc/zlib/
 AM_CPPFLAGS = \
 	-I$(top_builddir)/include \
 	$(MAYBE_INTERNAL_ZIP_INCLUDES)