[kaffe] CVS kaffe (robilad): Merged in zlib

Kaffe CVS cvs-commits at kaffe.org
Wed Dec 28 12:51:50 PST 2005 

PatchSet 7063 
Date: 2005/12/28 20:43:48
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Merged in zlib

2005-12-28 Dalibor Topic  <robilad at kaffe.org>

        * libraries/clib/zlib/ : Merged in zlib 1.2.3 from gcc.

        * THIRDPARTY: Added zlib.

        * configure.ac: (--with-internal-zlib) New option.

        * libraries/clib/zip/Makefile.am: Adapted to allow use
        of internal zlib.

        * libraries/clib/Makefile.am: Use internal zlib if selected.

Members: 
	ChangeLog:1.4582->1.4583 
	Makefile.in:1.237->1.238 
	THIRDPARTY:1.40->1.41 
	configure:1.519->1.520 
	configure.ac:1.197->1.198 
	config/Makefile.in:1.202->1.203 
	include/Makefile.in:1.264->1.265 
	kaffe/Makefile.in:1.162->1.163 
	kaffe/jvmpi/Makefile.in:1.86->1.87 
	kaffe/kaffe/Makefile.in:1.184->1.185 
	kaffe/kaffeh/Makefile.in:1.164->1.165 
	kaffe/kaffevm/Makefile.in:1.217->1.218 
	kaffe/kaffevm/boehm-gc/Makefile.in:1.49->1.50 
	kaffe/kaffevm/gcj/Makefile.in:1.142->1.143 
	kaffe/kaffevm/intrp/Makefile.in:1.151->1.152 
	kaffe/kaffevm/jit/Makefile.in:1.161->1.162 
	kaffe/kaffevm/jit3/Makefile.in:1.131->1.132 
	kaffe/kaffevm/jni/Makefile.in:1.55->1.56 
	kaffe/kaffevm/kaffe-gc/Makefile.in:1.48->1.49 
	kaffe/kaffevm/systems/Makefile.in:1.151->1.152 
	kaffe/kaffevm/systems/beos-native/Makefile.in:1.142->1.143 
	kaffe/kaffevm/systems/drops-l4threads/Makefile.in:1.5->1.6 
	kaffe/kaffevm/systems/oskit-pthreads/Makefile.in:1.148->1.149 
	kaffe/kaffevm/systems/unix-jthreads/Makefile.in:1.152->1.153 
	kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.127->1.128 
	kaffe/kaffevm/verifier/Makefile.in:1.54->1.55 
	kaffe/man/Makefile.in:1.149->1.150 
	kaffe/scripts/Makefile.in:1.189->1.190 
	kaffe/scripts/bat/Makefile.in:1.141->1.142 
	kaffe/scripts/compat/Makefile.in:1.168->1.169 
	kaffe/xprof/Makefile.in:1.117->1.118 
	libraries/Makefile.in:1.145->1.146 
	libraries/clib/Makefile.am:1.20->1.21 
	libraries/clib/Makefile.in:1.161->1.162 
	libraries/clib/awt/Makefile.in:1.160->1.161 
	libraries/clib/awt/X/Makefile.in:1.153->1.154 
	libraries/clib/awt/nano-X/Makefile.in:1.25->1.26 
	libraries/clib/awt/qt/Makefile.in:1.108->1.109 
	libraries/clib/fdlibm/Makefile.in:1.23->1.24 
	libraries/clib/io/Makefile.in:1.158->1.159 
	libraries/clib/management/Makefile.in:1.162->1.163 
	libraries/clib/math/Makefile.in:1.157->1.158 
	libraries/clib/native/Makefile.in:1.203->1.204 
	libraries/clib/net/Makefile.in:1.167->1.168 
	libraries/clib/nio/Makefile.in:1.92->1.93 
	libraries/clib/security/Makefile.in:1.128->1.129 
	libraries/clib/sound/Makefile.in:1.54->1.55 
	libraries/clib/sound/alsa/Makefile.in:1.55->1.56 
	libraries/clib/sound/common/Makefile.in:1.54->1.55 
	libraries/clib/sound/esd/Makefile.in:1.55->1.56 
	libraries/clib/target/Makefile.in:1.14->1.15 
	libraries/clib/target/Linux/Makefile.in:1.14->1.15 
	libraries/clib/target/generic/Makefile.in:1.14->1.15 
	libraries/clib/zip/Makefile.am:INITIAL->1.13 
	libraries/clib/zip/Makefile.in:1.159->1.160 
	libraries/clib/zlib/ChangeLog:INITIAL->1.1 
	libraries/clib/zlib/ChangeLog.gcj:INITIAL->1.1 
	libraries/clib/zlib/ChangeLog.kaffe:INITIAL->1.1 
	libraries/clib/zlib/FAQ:INITIAL->1.1 
	libraries/clib/zlib/INDEX:INITIAL->1.1 
	libraries/clib/zlib/Makefile.am:INITIAL->1.1 
	libraries/clib/zlib/Makefile.in:INITIAL->1.1 
	libraries/clib/zlib/README:INITIAL->1.1 
	libraries/clib/zlib/acinclude.m4:INITIAL->1.1 
	libraries/clib/zlib/aclocal.m4:INITIAL->1.1 
	libraries/clib/zlib/adler32.c:INITIAL->1.1 
	libraries/clib/zlib/algorithm.txt:INITIAL->1.1 
	libraries/clib/zlib/compress.c:INITIAL->1.1 
	libraries/clib/zlib/configure:INITIAL->1.1 
	libraries/clib/zlib/configure.ac:INITIAL->1.1 
	libraries/clib/zlib/crc32.c:INITIAL->1.1 
	libraries/clib/zlib/crc32.h:INITIAL->1.1 
	libraries/clib/zlib/deflate.c:INITIAL->1.1 
	libraries/clib/zlib/deflate.h:INITIAL->1.1 
	libraries/clib/zlib/example.c:INITIAL->1.1 
	libraries/clib/zlib/gzio.c:INITIAL->1.1 
	libraries/clib/zlib/infback.c:INITIAL->1.1 
	libraries/clib/zlib/inffast.c:INITIAL->1.1 
	libraries/clib/zlib/inffast.h:INITIAL->1.1 
	libraries/clib/zlib/inffixed.h:INITIAL->1.1 
	libraries/clib/zlib/inflate.c:INITIAL->1.1 
	libraries/clib/zlib/inflate.h:INITIAL->1.1 
	libraries/clib/zlib/inftrees.c:INITIAL->1.1 
	libraries/clib/zlib/inftrees.h:INITIAL->1.1 
	libraries/clib/zlib/make_vms.com:INITIAL->1.1 
	libraries/clib/zlib/minigzip.c:INITIAL->1.1 
	libraries/clib/zlib/trees.c:INITIAL->1.1 
	libraries/clib/zlib/trees.h:INITIAL->1.1 
	libraries/clib/zlib/uncompr.c:INITIAL->1.1 
	libraries/clib/zlib/zconf.h:INITIAL->1.1 
	libraries/clib/zlib/zconf.in.h:INITIAL->1.1 
	libraries/clib/zlib/zlib.3:INITIAL->1.1 
	libraries/clib/zlib/zlib.h:INITIAL->1.1 
	libraries/clib/zlib/zutil.c:INITIAL->1.1 
	libraries/clib/zlib/zutil.h:INITIAL->1.1 
	libraries/clib/zlib/amiga/Makefile.pup:INITIAL->1.1 
	libraries/clib/zlib/amiga/Makefile.sas:INITIAL->1.1 
	libraries/clib/zlib/as400/bndsrc:INITIAL->1.1 
	libraries/clib/zlib/as400/compile.clp:INITIAL->1.1 
	libraries/clib/zlib/as400/readme.txt:INITIAL->1.1 
	libraries/clib/zlib/as400/zlib.inc:INITIAL->1.1 
	libraries/clib/zlib/contrib/README.contrib:INITIAL->1.1 
	libraries/clib/zlib/contrib/ada/buffer_demo.adb:INITIAL->1.1 
	libraries/clib/zlib/contrib/ada/mtest.adb:INITIAL->1.1 
	libraries/clib/zlib/contrib/ada/read.adb:INITIAL->1.1 
	libraries/clib/zlib/contrib/ada/readme.txt:INITIAL->1.1 
	libraries/clib/zlib/contrib/ada/test.adb:INITIAL->1.1 
	libraries/clib/zlib/contrib/ada/zlib-streams.adb:INITIAL->1.1 
	libraries/clib/zlib/contrib/ada/zlib-streams.ads:INITIAL->1.1 
	libraries/clib/zlib/contrib/ada/zlib-thin.adb:INITIAL->1.1 
	libraries/clib/zlib/contrib/ada/zlib-thin.ads:INITIAL->1.1 
	libraries/clib/zlib/contrib/ada/zlib.adb:INITIAL->1.1 
	libraries/clib/zlib/contrib/ada/zlib.ads:INITIAL->1.1 
	libraries/clib/zlib/contrib/ada/zlib.gpr:INITIAL->1.1 
	libraries/clib/zlib/contrib/asm586/README.586:INITIAL->1.1 
	libraries/clib/zlib/contrib/asm586/match.S:INITIAL->1.1 
	libraries/clib/zlib/contrib/asm686/README.686:INITIAL->1.1 
	libraries/clib/zlib/contrib/asm686/match.S:INITIAL->1.1 
	libraries/clib/zlib/contrib/blast/Makefile:INITIAL->1.1 
	libraries/clib/zlib/contrib/blast/README:INITIAL->1.1 
	libraries/clib/zlib/contrib/blast/blast.c:INITIAL->1.1 
	libraries/clib/zlib/contrib/blast/blast.h:INITIAL->1.1 
	libraries/clib/zlib/contrib/blast/test.pk:INITIAL->1.1 
	libraries/clib/zlib/contrib/blast/test.txt:INITIAL->1.1 
	libraries/clib/zlib/contrib/delphi/ZLib.pas:INITIAL->1.1 
	libraries/clib/zlib/contrib/delphi/ZLibConst.pas:INITIAL->1.1 
	libraries/clib/zlib/contrib/delphi/readme.txt:INITIAL->1.1 
	libraries/clib/zlib/contrib/delphi/zlibd32.mak:INITIAL->1.1 
	libraries/clib/zlib/contrib/dotzlib/DotZLib.build:INITIAL->1.1 
	libraries/clib/zlib/contrib/dotzlib/DotZLib.chm:INITIAL->1.1 
	libraries/clib/zlib/contrib/dotzlib/DotZLib.sln:INITIAL->1.1 
	libraries/clib/zlib/contrib/dotzlib/LICENSE_1_0.txt:INITIAL->1.1 
	libraries/clib/zlib/contrib/dotzlib/readme.txt:INITIAL->1.1 
	libraries/clib/zlib/contrib/dotzlib/DotZLib/AssemblyInfo.cs:INITIAL->1.1 
	libraries/clib/zlib/contrib/dotzlib/DotZLib/ChecksumImpl.cs:INITIAL->1.1 
	libraries/clib/zlib/contrib/dotzlib/DotZLib/CircularBuffer.cs:INITIAL->1.1 
	libraries/clib/zlib/contrib/dotzlib/DotZLib/CodecBase.cs:INITIAL->1.1 
	libraries/clib/zlib/contrib/dotzlib/DotZLib/Deflater.cs:INITIAL->1.1 
	libraries/clib/zlib/contrib/dotzlib/DotZLib/DotZLib.cs:INITIAL->1.1 
	libraries/clib/zlib/contrib/dotzlib/DotZLib/DotZLib.csproj:INITIAL->1.1 
	libraries/clib/zlib/contrib/dotzlib/DotZLib/GZipStream.cs:INITIAL->1.1 
	libraries/clib/zlib/contrib/dotzlib/DotZLib/Inflater.cs:INITIAL->1.1 
	libraries/clib/zlib/contrib/dotzlib/DotZLib/UnitTests.cs:INITIAL->1.1 
	libraries/clib/zlib/contrib/infback9/README:INITIAL->1.1 
	libraries/clib/zlib/contrib/infback9/infback9.c:INITIAL->1.1 
	libraries/clib/zlib/contrib/infback9/infback9.h:INITIAL->1.1 
	libraries/clib/zlib/contrib/infback9/inffix9.h:INITIAL->1.1 
	libraries/clib/zlib/contrib/infback9/inflate9.h:INITIAL->1.1 
	libraries/clib/zlib/contrib/infback9/inftree9.c:INITIAL->1.1 
	libraries/clib/zlib/contrib/infback9/inftree9.h:INITIAL->1.1 
	libraries/clib/zlib/contrib/inflate86/inffas86.c:INITIAL->1.1 
	libraries/clib/zlib/contrib/inflate86/inffast.S:INITIAL->1.1 
	libraries/clib/zlib/contrib/iostream/test.cpp:INITIAL->1.1 
	libraries/clib/zlib/contrib/iostream/zfstream.cpp:INITIAL->1.1 
	libraries/clib/zlib/contrib/iostream/zfstream.h:INITIAL->1.1 
	libraries/clib/zlib/contrib/iostream2/zstream.h:INITIAL->1.1 
	libraries/clib/zlib/contrib/iostream2/zstream_test.cpp:INITIAL->1.1 
	libraries/clib/zlib/contrib/iostream3/README:INITIAL->1.1 
	libraries/clib/zlib/contrib/iostream3/TODO:INITIAL->1.1 
	libraries/clib/zlib/contrib/iostream3/test.cc:INITIAL->1.1 
	libraries/clib/zlib/contrib/iostream3/zfstream.cc:INITIAL->1.1 
	libraries/clib/zlib/contrib/iostream3/zfstream.h:INITIAL->1.1 
	libraries/clib/zlib/contrib/masm686/match.asm:INITIAL->1.1 
	libraries/clib/zlib/contrib/masmx64/bld_ml64.bat:INITIAL->1.1 
	libraries/clib/zlib/contrib/masmx64/gvmat64.asm:INITIAL->1.1 
	libraries/clib/zlib/contrib/masmx64/gvmat64.obj:INITIAL->1.1 
	libraries/clib/zlib/contrib/masmx64/inffas8664.c:INITIAL->1.1 
	libraries/clib/zlib/contrib/masmx64/inffasx64.asm:INITIAL->1.1 
	libraries/clib/zlib/contrib/masmx64/inffasx64.obj:INITIAL->1.1 
	libraries/clib/zlib/contrib/masmx64/readme.txt:INITIAL->1.1 
	libraries/clib/zlib/contrib/masmx86/bld_ml32.bat:INITIAL->1.1 
	libraries/clib/zlib/contrib/masmx86/gvmat32.asm:INITIAL->1.1 
	libraries/clib/zlib/contrib/masmx86/gvmat32.obj:INITIAL->1.1 
	libraries/clib/zlib/contrib/masmx86/gvmat32c.c:INITIAL->1.1 
	libraries/clib/zlib/contrib/masmx86/inffas32.asm:INITIAL->1.1 
	libraries/clib/zlib/contrib/masmx86/inffas32.obj:INITIAL->1.1 
	libraries/clib/zlib/contrib/masmx86/mkasm.bat:INITIAL->1.1 
	libraries/clib/zlib/contrib/masmx86/readme.txt:INITIAL->1.1 
	libraries/clib/zlib/contrib/minizip/ChangeLogUnzip:INITIAL->1.1 
	libraries/clib/zlib/contrib/minizip/Makefile:INITIAL->1.1 
	libraries/clib/zlib/contrib/minizip/crypt.h:INITIAL->1.1 
	libraries/clib/zlib/contrib/minizip/ioapi.c:INITIAL->1.1 
	libraries/clib/zlib/contrib/minizip/ioapi.h:INITIAL->1.1 
	libraries/clib/zlib/contrib/minizip/iowin32.c:INITIAL->1.1 
	libraries/clib/zlib/contrib/minizip/iowin32.h:INITIAL->1.1 
	libraries/clib/zlib/contrib/minizip/miniunz.c:INITIAL->1.1 
	libraries/clib/zlib/contrib/minizip/minizip.c:INITIAL->1.1 
	libraries/clib/zlib/contrib/minizip/mztools.c:INITIAL->1.1 
	libraries/clib/zlib/contrib/minizip/mztools.h:INITIAL->1.1 
	libraries/clib/zlib/contrib/minizip/unzip.c:INITIAL->1.1 
	libraries/clib/zlib/contrib/minizip/unzip.h:INITIAL->1.1 
	libraries/clib/zlib/contrib/minizip/zip.c:INITIAL->1.1 
	libraries/clib/zlib/contrib/minizip/zip.h:INITIAL->1.1 
	libraries/clib/zlib/contrib/pascal/example.pas:INITIAL->1.1 
	libraries/clib/zlib/contrib/pascal/readme.txt:INITIAL->1.1 
	libraries/clib/zlib/contrib/pascal/zlibd32.mak:INITIAL->1.1 
	libraries/clib/zlib/contrib/pascal/zlibpas.pas:INITIAL->1.1 
	libraries/clib/zlib/contrib/puff/Makefile:INITIAL->1.1 
	libraries/clib/zlib/contrib/puff/README:INITIAL->1.1 
	libraries/clib/zlib/contrib/puff/puff.c:INITIAL->1.1 
	libraries/clib/zlib/contrib/puff/puff.h:INITIAL->1.1 
	libraries/clib/zlib/contrib/puff/zeros.raw:INITIAL->1.1 
	libraries/clib/zlib/contrib/testzlib/testzlib.c:INITIAL->1.1 
	libraries/clib/zlib/contrib/testzlib/testzlib.txt:INITIAL->1.1 
	libraries/clib/zlib/contrib/untgz/Makefile:INITIAL->1.1 
	libraries/clib/zlib/contrib/untgz/Makefile.msc:INITIAL->1.1 
	libraries/clib/zlib/contrib/untgz/untgz.c:INITIAL->1.1 
	libraries/clib/zlib/contrib/vstudio/readme.txt:INITIAL->1.1 
	libraries/clib/zlib/contrib/vstudio/vc7/miniunz.vcproj:INITIAL->1.1 
	libraries/clib/zlib/contrib/vstudio/vc7/minizip.vcproj:INITIAL->1.1 
	libraries/clib/zlib/contrib/vstudio/vc7/testzlib.vcproj:INITIAL->1.1 
	libraries/clib/zlib/contrib/vstudio/vc7/zlib.rc:INITIAL->1.1 
	libraries/clib/zlib/contrib/vstudio/vc7/zlibstat.vcproj:INITIAL->1.1 
	libraries/clib/zlib/contrib/vstudio/vc7/zlibvc.def:INITIAL->1.1 
	libraries/clib/zlib/contrib/vstudio/vc7/zlibvc.sln:INITIAL->1.1 
	libraries/clib/zlib/contrib/vstudio/vc7/zlibvc.vcproj:INITIAL->1.1 
	libraries/clib/zlib/contrib/vstudio/vc8/miniunz.vcproj:INITIAL->1.1 
	libraries/clib/zlib/contrib/vstudio/vc8/minizip.vcproj:INITIAL->1.1 
	libraries/clib/zlib/contrib/vstudio/vc8/testzlib.vcproj:INITIAL->1.1 
	libraries/clib/zlib/contrib/vstudio/vc8/testzlibdll.vcproj:INITIAL->1.1 
	libraries/clib/zlib/contrib/vstudio/vc8/zlib.rc:INITIAL->1.1 
	libraries/clib/zlib/contrib/vstudio/vc8/zlibstat.vcproj:INITIAL->1.1 
	libraries/clib/zlib/contrib/vstudio/vc8/zlibvc.def:INITIAL->1.1 
	libraries/clib/zlib/contrib/vstudio/vc8/zlibvc.sln:INITIAL->1.1 
	libraries/clib/zlib/contrib/vstudio/vc8/zlibvc.vcproj:INITIAL->1.1 
	libraries/clib/zlib/examples/README.examples:INITIAL->1.1 
	libraries/clib/zlib/examples/fitblk.c:INITIAL->1.1 
	libraries/clib/zlib/examples/gun.c:INITIAL->1.1 
	libraries/clib/zlib/examples/gzappend.c:INITIAL->1.1 
	libraries/clib/zlib/examples/gzjoin.c:INITIAL->1.1 
	libraries/clib/zlib/examples/gzlog.c:INITIAL->1.1 
	libraries/clib/zlib/examples/gzlog.h:INITIAL->1.1 
	libraries/clib/zlib/examples/zlib_how.html:INITIAL->1.1 
	libraries/clib/zlib/examples/zpipe.c:INITIAL->1.1 
	libraries/clib/zlib/examples/zran.c:INITIAL->1.1 
	libraries/clib/zlib/msdos/Makefile.bor:INITIAL->1.1 
	libraries/clib/zlib/msdos/Makefile.dj2:INITIAL->1.1 
	libraries/clib/zlib/msdos/Makefile.emx:INITIAL->1.1 
	libraries/clib/zlib/msdos/Makefile.msc:INITIAL->1.1 
	libraries/clib/zlib/msdos/Makefile.tc:INITIAL->1.1 
	libraries/clib/zlib/old/Makefile.riscos:INITIAL->1.1 
	libraries/clib/zlib/old/README:INITIAL->1.1 
	libraries/clib/zlib/old/descrip.mms:INITIAL->1.1 
	libraries/clib/zlib/old/visual-basic.txt:INITIAL->1.1 
	libraries/clib/zlib/old/zlib.html:INITIAL->1.1 
	libraries/clib/zlib/old/os2/Makefile.os2:INITIAL->1.1 
	libraries/clib/zlib/old/os2/zlib.def:INITIAL->1.1 
	libraries/clib/zlib/projects/README.projects:INITIAL->1.1 
	libraries/clib/zlib/projects/visualc6/README.txt:INITIAL->1.1 
	libraries/clib/zlib/projects/visualc6/example.dsp:INITIAL->1.1 
	libraries/clib/zlib/projects/visualc6/minigzip.dsp:INITIAL->1.1 
	libraries/clib/zlib/projects/visualc6/zlib.dsp:INITIAL->1.1 
	libraries/clib/zlib/projects/visualc6/zlib.dsw:INITIAL->1.1 
	libraries/clib/zlib/qnx/package.qpg:INITIAL->1.1 
	libraries/clib/zlib/win32/DLL_FAQ.txt:INITIAL->1.1 
	libraries/clib/zlib/win32/Makefile.bor:INITIAL->1.1 
	libraries/clib/zlib/win32/Makefile.emx:INITIAL->1.1 
	libraries/clib/zlib/win32/Makefile.gcc:INITIAL->1.1 
	libraries/clib/zlib/win32/Makefile.msc:INITIAL->1.1 
	libraries/clib/zlib/win32/VisualC.txt:INITIAL->1.1 
	libraries/clib/zlib/win32/zlib.def:INITIAL->1.1 
	libraries/clib/zlib/win32/zlib1.rc:INITIAL->1.1 
	libraries/extensions/Makefile.in:1.137->1.138 
	libraries/extensions/comm/Makefile.in:1.131->1.132 
	libraries/extensions/comm/javalib/Makefile.in:1.132->1.133 
	libraries/extensions/microsoft/Makefile.in:1.123->1.124 
	libraries/extensions/microsoft/clib/Makefile.in:1.127->1.128 
	libraries/extensions/microsoft/javalib/Makefile.in:1.125->1.126 
	libraries/extensions/pjava/Makefile.in:1.131->1.132 
	libraries/extensions/pjava/javalib/Makefile.in:1.132->1.133 
	libraries/extensions/servlet/Makefile.in:1.131->1.132 
	libraries/extensions/servlet/javalib/Makefile.in:1.132->1.133 
	libraries/javalib/Makefile.in:1.516->1.517 
	libraries/javalib/awt-implementations/Makefile.in:1.39->1.40 
	libraries/javalib/awt-implementations/kaffe/Makefile.in:1.43->1.44 
	libraries/javalib/external/classpath/config.guess:1.8->1.9 
	libraries/javalib/external/classpath/ltmain.sh:1.8->1.9 
	libraries/javalib/gmp-math/Makefile.in:1.46->1.47 
	po/de.po:1.6->1.7 
	po/fr.po:1.21->1.22 
	po/kaffe.pot:1.18->1.19 
	po/zh_CN.po:1.9->1.10 
	po/zh_TW.po:1.26->1.27 
	replace/Makefile.in:1.104->1.105 
	scripts/ltmain.sh:1.14->1.15 
	test/Makefile.in:1.154->1.155 
	test/internal/Makefile.in:1.123->1.124 
	test/jni/Makefile.in:1.57->1.58 
	test/regression/Makefile.in:1.229->1.230 
	test/regression/compile_time/Makefile.in:1.82->1.83 
	test/regression/compiler/Makefile.in:1.66->1.67 
	test/regression/run_time/Makefile.in:1.81->1.82 
	tools/Makefile.in:1.56->1.57 
	tools/gjdoc/Makefile.in:1.55->1.56 
	tools/gjdoc/javalib/Makefile.in:1.71->1.72 
	tools/javatools/Makefile.in:1.9->1.10 
	tools/javatools/javalib/Makefile.in:1.10->1.11 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4582 kaffe/ChangeLog:1.4583
--- kaffe/ChangeLog:1.4582	Wed Dec 28 19:05:52 2005
+++ kaffe/ChangeLog	Wed Dec 28 20:43:48 2005
@@ -1,3 +1,16 @@
+2005-12-28 Dalibor Topic  <robilad at kaffe.org>
+
+	* libraries/clib/zlib/ : Merged in zlib 1.2.3 from gcc.
+
+	* THIRDPARTY: Added zlib.
+
+	* configure.ac: (--with-internal-zlib) New option.
+
+	* libraries/clib/zip/Makefile.am: Adapted to allow use
+	of internal zlib.
+
+	* libraries/clib/Makefile.am: Use internal zlib if selected.
+
 2005-12-28  Guilhem Lavaux  <guilhem at kaffe.org>
 
 	* kaffe/kaffevm/locks.c
Index: kaffe/Makefile.in
diff -u kaffe/Makefile.in:1.237 kaffe/Makefile.in:1.238
--- kaffe/Makefile.in:1.237	Sun Dec 25 18:10:06 2005
+++ kaffe/Makefile.in	Wed Dec 28 20:43:51 2005
@@ -139,6 +139,8 @@
 COND_DIRECT_THREADING_TRUE = @COND_DIRECT_THREADING_TRUE@
 COND_GJDOC_FALSE = @COND_GJDOC_FALSE@
 COND_GJDOC_TRUE = @COND_GJDOC_TRUE@
+COND_INTERNAL_ZLIB_FALSE = @COND_INTERNAL_ZLIB_FALSE@
+COND_INTERNAL_ZLIB_TRUE = @COND_INTERNAL_ZLIB_TRUE@
 COND_KAFFE_NANOX_AWT_FALSE = @COND_KAFFE_NANOX_AWT_FALSE@
 COND_KAFFE_NANOX_AWT_TRUE = @COND_KAFFE_NANOX_AWT_TRUE@
 COND_KAFFE_QT_AWT_FALSE = @COND_KAFFE_QT_AWT_FALSE@
Index: kaffe/THIRDPARTY
diff -u kaffe/THIRDPARTY:1.40 kaffe/THIRDPARTY:1.41
--- kaffe/THIRDPARTY:1.40	Tue Sep 20 00:15:19 2005
+++ kaffe/THIRDPARTY	Wed Dec 28 20:43:51 2005
@@ -3,6 +3,45 @@
 licenses of third party sources either in their respective sources, or
 in license*.terms files in the top directory, or here.
 
+* libraries/clib/zlib
+
+This code has been merged in from gcc Subversion repository. Merged in
+is version 1.2.3 of zlib, which has some small patches from gcc developers.
+
+zlib is distributed under the zlib license:
+
+/* zlib.h -- interface of the 'zlib' general purpose compression library
+  version 1.2.3, July 18th, 2005
+
+  Copyright (C) 1995-2005 Jean-loup Gailly and Mark Adler
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+  Jean-loup Gailly        Mark Adler
+  jloup at gzip.org          madler at alumni.caltech.edu
+
+
+  The data format used by the zlib library is described by RFCs (Request for
+  Comments) 1950 to 1952 in the files http://www.ietf.org/rfc/rfc1950.txt
+  (zlib format), rfc1951.txt (deflate format) and rfc1952.txt (gzip format).
+*/
+
+More information on zlib is available from http://www.zlib.net.
+
 * javax.sound 
 
 This code has been merged in from tritonus.org. The tritonus project
Index: kaffe/configure
diff -u kaffe/configure:1.519 kaffe/configure:1.520
--- kaffe/configure:1.519	Sun Dec 25 18:10:06 2005
+++ kaffe/configure	Wed Dec 28 20:43:51 2005
@@ -492,7 +492,7 @@
 ac_subdirs_all="$ac_subdirs_all kaffe/kaffevm/boehm-gc/boehm"
 ac_subdirs_all="$ac_subdirs_all libraries/javalib/external/classpath"
 ac_subdirs_all="$ac_subdirs_all libltdl"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT abssrcdir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CCAS CCASFLAGS build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBTOOL_DEPS LIBLTDL CCLD MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB MAY_RUN_PO_TRUE MAY_RUN_PO_FALSE REGEN_FORWARD CONFIG_MD_H CONFIG_CALLKAFFEEXCEPTION_H KAFFEVM_MD_C CONFIG_JIT_MD_H KAFFEVM_JIT_DEF KAFFEVM_ICODE_H HAVE_CONFIG_JIT_MD_H USE_JIT_TRUE USE_JIT_FALSE ENGINE_NAME BCEL_JAR HAVE_BCEL_TRUE HAVE_BCEL_FALSE ENABLE_JVMPI_TRUE ENABLE_JVMPI_FALSE ENABLE_XPROF_TRUE ENABLE_XPROF_FALSE CONFIG_XPROFILE_MD_H JAVAC_FLAGS NEED_LIBXPROF_TRUE NEED_LIBXPROF_FALSE CFLAGS_PG SUN_COMPAT_TRUE SUN_COMPAT_FALSE THREAD_DIR acx_pthread_config PTHREAD_CC PTHREAD_LIBS PTHREAD_CFLAGS SEMAPHORE_LIB VM_LIBS USE_PRECOMPILED_RT_JAR_TRUE USE_PRECOMPILED_RT_JAR_FALSE PATH_TO_RT_JAR JIKESPROG JAVA_COMPILER KAFFEVM_TRAMPOLINES_S JAVA_LIBS with_engine THREAD_SYSTEM KPREFIX KAFFE_ARCHOS ZIP MKTEMP JASMIN HAVE_ZIP_TRUE HAVE_ZIP_FALSE HAVE_JAVAC_TRUE HAVE_JAVAC_FALSE HAVE_MKTEMP_TRUE HAVE_MKTEMP_FALSE HAVE_JASMIN_TRUE HAVE_JASMIN_FALSE KAFFE_LIBS M_LIBS NET_LIBS ZIP_LIBS LIBADD_GMP USE_GMP SECURITY_LIBS GC_NAME subdirs BOEHMGC_SPECIFIC_FLAGS HAVE_GCJ_SUPPORT_TRUE HAVE_GCJ_SUPPORT_FALSE LIBOBJS USE_COMPAT_IFADDRS_TRUE USE_COMPAT_IFADDRS_FALSE COND_NATIVE_AWT_TRUE COND_NATIVE_AWT_FALSE COND_KAFFE_X_AWT_TRUE COND_KAFFE_X_AWT_FALSE X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS AWT_LIBS XI18N_CFLAGS COND_KAFFE_QT_AWT_TRUE COND_KAFFE_QT_AWT_FALSE MOC UIC QEMBED QT_CXXFLAGS QT_LDADD QT_GUILINK QASSISTANTCLIENT_LDADD COND_KAFFE_NANOX_AWT_TRUE COND_KAFFE_NANOX_AWT_FALSE NANOX_CFLAGS ALSA_CFLAGS ALSA_LIBS ESD_CONFIG ESD_CFLAGS ESD_LIBS COND_SOUND_ALSA_TRUE COND_SOUND_ALSA_FALSE COND_SOUND_ESD_TRUE COND_SOUND_ESD_FALSE COND_NATIVE_SOUND_TRUE COND_NATIVE_SOUND_FALSE COND_PURE_JAVA_MATH_TRUE COND_PURE_JAVA_MATH_FALSE MATH_LIB INCLUDED_EXTENSIONS PROFILE COND_GJDOC_TRUE COND_GJDOC_FALSE COND_CLASSPATH_TOOLS_TRUE COND_CLASSPATH_TOOLS_FALSE DLOPEN_JAVA_LIBS OPT_DLOPEN_JAVA_LIBS KLIBFLAGS KVMBINFLAGS KVMLIBFLAGS INIT_LOAD_LIBRARY COND_DIRECT_THREADING_TRUE COND_DIRECT_THREADING_FALSE BINRELOC_CFLAGS BINRELOC_LIBS KAFFEH MAKE_KAFFEH toolslibdir jredir jrebindir jrelibdir nativedir securitydir PATHSEP DIRSEP kaffe_TRANSF kaffeh_TRANSF kaffebin_TRANSF CFLAGS_WITHOUT_PG CLASSPATH_INCLUDES LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT abssrcdir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CCAS CCASFLAGS build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CPP CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL LIBTOOL_DEPS LIBLTDL CCLD MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB MAY_RUN_PO_TRUE MAY_RUN_PO_FALSE REGEN_FORWARD CONFIG_MD_H CONFIG_CALLKAFFEEXCEPTION_H KAFFEVM_MD_C CONFIG_JIT_MD_H KAFFEVM_JIT_DEF KAFFEVM_ICODE_H HAVE_CONFIG_JIT_MD_H USE_JIT_TRUE USE_JIT_FALSE ENGINE_NAME BCEL_JAR HAVE_BCEL_TRUE HAVE_BCEL_FALSE ENABLE_JVMPI_TRUE ENABLE_JVMPI_FALSE ENABLE_XPROF_TRUE ENABLE_XPROF_FALSE CONFIG_XPROFILE_MD_H JAVAC_FLAGS NEED_LIBXPROF_TRUE NEED_LIBXPROF_FALSE CFLAGS_PG SUN_COMPAT_TRUE SUN_COMPAT_FALSE THREAD_DIR acx_pthread_config PTHREAD_CC PTHREAD_LIBS PTHREAD_CFLAGS SEMAPHORE_LIB VM_LIBS USE_PRECOMPILED_RT_JAR_TRUE USE_PRECOMPILED_RT_JAR_FALSE PATH_TO_RT_JAR JIKESPROG JAVA_COMPILER KAFFEVM_TRAMPOLINES_S JAVA_LIBS with_engine THREAD_SYSTEM KPREFIX KAFFE_ARCHOS ZIP MKTEMP JASMIN HAVE_ZIP_TRUE HAVE_ZIP_FALSE HAVE_JAVAC_TRUE HAVE_JAVAC_FALSE HAVE_MKTEMP_TRUE HAVE_MKTEMP_FALSE HAVE_JASMIN_TRUE HAVE_JASMIN_FALSE KAFFE_LIBS M_LIBS NET_LIBS ZIP_LIBS LIBADD_GMP USE_GMP SECURITY_LIBS GC_NAME subdirs BOEHMGC_SPECIFIC_FLAGS HAVE_GCJ_SUPPORT_TRUE HAVE_GCJ_SUPPORT_FALSE LIBOBJS USE_COMPAT_IFADDRS_TRUE USE_COMPAT_IFADDRS_FALSE COND_NATIVE_AWT_TRUE COND_NATIVE_AWT_FALSE COND_KAFFE_X_AWT_TRUE COND_KAFFE_X_AWT_FALSE X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS AWT_LIBS XI18N_CFLAGS COND_KAFFE_QT_AWT_TRUE COND_KAFFE_QT_AWT_FALSE MOC UIC QEMBED QT_CXXFLAGS QT_LDADD QT_GUILINK QASSISTANTCLIENT_LDADD COND_KAFFE_NANOX_AWT_TRUE COND_KAFFE_NANOX_AWT_FALSE NANOX_CFLAGS ALSA_CFLAGS ALSA_LIBS ESD_CONFIG ESD_CFLAGS ESD_LIBS COND_SOUND_ALSA_TRUE COND_SOUND_ALSA_FALSE COND_SOUND_ESD_TRUE COND_SOUND_ESD_FALSE COND_NATIVE_SOUND_TRUE COND_NATIVE_SOUND_FALSE COND_PURE_JAVA_MATH_TRUE COND_PURE_JAVA_MATH_FALSE MATH_LIB INCLUDED_EXTENSIONS PROFILE COND_GJDOC_TRUE COND_GJDOC_FALSE COND_CLASSPATH_TOOLS_TRUE COND_CLASSPATH_TOOLS_FALSE DLOPEN_JAVA_LIBS OPT_DLOPEN_JAVA_LIBS KLIBFLAGS KVMBINFLAGS KVMLIBFLAGS INIT_LOAD_LIBRARY COND_DIRECT_THREADING_TRUE COND_DIRECT_THREADING_FALSE COND_INTERNAL_ZLIB_TRUE COND_INTERNAL_ZLIB_FALSE BINRELOC_CFLAGS BINRELOC_LIBS KAFFEH MAKE_KAFFEH toolslibdir jredir jrebindir jrelibdir nativedir securitydir PATHSEP DIRSEP kaffe_TRANSF kaffeh_TRANSF kaffebin_TRANSF CFLAGS_WITHOUT_PG CLASSPATH_INCLUDES LTLIBOBJS'
 ac_subst_files='cpu_os_frag cpu_frag engine_frag threads_frag gc_frag'
 
 # Initialize some variables set by options.
@@ -1183,6 +1183,8 @@
 			  http://www.dmalloc.com/dmalloc.tar.gz
   --with-class-library-profile=ABS.PATH
                           specify class library profile
+  --with-internal-zlib    Use Kaffe's internal copy of zlib instead of system
+                          one
   --with-jni-library-path=dir
                           additional directories to search for native jni
                           libraries
@@ -5981,7 +5983,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 5984 "configure"' > conftest.$ac_ext
+  echo '#line 5986 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -7358,7 +7360,7 @@
 
 
 # Provide some information about the compiler.
-echo "$as_me:7361:" \
+echo "$as_me:7363:" \
      "checking for Fortran 77 compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
 { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -8425,11 +8427,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8428: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8430: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8432: \$? = $ac_status" >&5
+   echo "$as_me:8434: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -8693,11 +8695,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8696: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8698: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8700: \$? = $ac_status" >&5
+   echo "$as_me:8702: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -8797,11 +8799,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8800: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8802: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8804: \$? = $ac_status" >&5
+   echo "$as_me:8806: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -11142,7 +11144,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 11145 "configure"
+#line 11147 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11242,7 +11244,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 11245 "configure"
+#line 11247 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -13586,11 +13588,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13589: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13591: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:13593: \$? = $ac_status" >&5
+   echo "$as_me:13595: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -13690,11 +13692,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13693: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13695: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:13697: \$? = $ac_status" >&5
+   echo "$as_me:13699: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -15260,11 +15262,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15263: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15265: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15267: \$? = $ac_status" >&5
+   echo "$as_me:15269: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -15364,11 +15366,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15367: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15369: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:15371: \$? = $ac_status" >&5
+   echo "$as_me:15373: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -17571,11 +17573,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17574: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17576: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:17578: \$? = $ac_status" >&5
+   echo "$as_me:17580: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -17839,11 +17841,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17842: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17844: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:17846: \$? = $ac_status" >&5
+   echo "$as_me:17848: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -17943,11 +17945,11 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17946: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17948: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:17950: \$? = $ac_status" >&5
+   echo "$as_me:17952: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -48823,6 +48825,27 @@
 
 
 
+# Check whether --with-internal-zlib or --without-internal-zlib was given.
+if test "${with_internal_zlib+set}" = set; then
+  withval="$with_internal_zlib"
+
+else
+  with_internal_zlib=no
+
+fi;
+
+
+
+if test x"$with_internal_zlib" != x"no"; then
+  COND_INTERNAL_ZLIB_TRUE=
+  COND_INTERNAL_ZLIB_FALSE='#'
+else
+  COND_INTERNAL_ZLIB_TRUE='#'
+  COND_INTERNAL_ZLIB_FALSE=
+fi
+
+
+
 
 for ac_header in pthread.h
 do
@@ -49702,6 +49725,8 @@
 
           ac_config_files="$ac_config_files libraries/clib/zip/Makefile"
 
+          ac_config_files="$ac_config_files libraries/clib/zlib/Makefile"
+
           ac_config_files="$ac_config_files libraries/clib/math/Makefile"
 
           ac_config_files="$ac_config_files libraries/clib/management/Makefile"
@@ -50116,6 +50141,13 @@
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
+if test -z "${COND_INTERNAL_ZLIB_TRUE}" && test -z "${COND_INTERNAL_ZLIB_FALSE}"; then
+  { { echo "$as_me:$LINENO: error: conditional \"COND_INTERNAL_ZLIB\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"COND_INTERNAL_ZLIB\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+   { (exit 1); exit 1; }; }
+fi
 
 : ${CONFIG_STATUS=./config.status}
 ac_clean_files_save=$ac_clean_files
@@ -50630,6 +50662,7 @@
   "libraries/clib/nio/Makefile" ) CONFIG_FILES="$CONFIG_FILES libraries/clib/nio/Makefile" ;;
   "libraries/clib/net/Makefile" ) CONFIG_FILES="$CONFIG_FILES libraries/clib/net/Makefile" ;;
   "libraries/clib/zip/Makefile" ) CONFIG_FILES="$CONFIG_FILES libraries/clib/zip/Makefile" ;;
+  "libraries/clib/zlib/Makefile" ) CONFIG_FILES="$CONFIG_FILES libraries/clib/zlib/Makefile" ;;
   "libraries/clib/math/Makefile" ) CONFIG_FILES="$CONFIG_FILES libraries/clib/math/Makefile" ;;
   "libraries/clib/management/Makefile" ) CONFIG_FILES="$CONFIG_FILES libraries/clib/management/Makefile" ;;
   "libraries/clib/security/Makefile" ) CONFIG_FILES="$CONFIG_FILES libraries/clib/security/Makefile" ;;
@@ -50988,6 +51021,8 @@
 s, at INIT_LOAD_LIBRARY@,$INIT_LOAD_LIBRARY,;t t
 s, at COND_DIRECT_THREADING_TRUE@,$COND_DIRECT_THREADING_TRUE,;t t
 s, at COND_DIRECT_THREADING_FALSE@,$COND_DIRECT_THREADING_FALSE,;t t
+s, at COND_INTERNAL_ZLIB_TRUE@,$COND_INTERNAL_ZLIB_TRUE,;t t
+s, at COND_INTERNAL_ZLIB_FALSE@,$COND_INTERNAL_ZLIB_FALSE,;t t
 s, at BINRELOC_CFLAGS@,$BINRELOC_CFLAGS,;t t
 s, at BINRELOC_LIBS@,$BINRELOC_LIBS,;t t
 s, at KAFFEH@,$KAFFEH,;t t
Index: kaffe/configure.ac
diff -u kaffe/configure.ac:1.197 kaffe/configure.ac:1.198
--- kaffe/configure.ac:1.197	Sun Dec 25 18:10:14 2005
+++ kaffe/configure.ac	Wed Dec 28 20:43:57 2005
@@ -2198,6 +2198,15 @@
 AM_CONDITIONAL([COND_DIRECT_THREADING], [test x"$enable_direct_threading" = x"yes"])
 
 
+AC_ARG_WITH([internal-zlib],
+	AS_HELP_STRING([--with-internal-zlib],
+		       [Use Kaffe's internal copy of zlib instead of system one]),
+	[],
+	[with_internal_zlib=no]
+)
+
+AM_CONDITIONAL(COND_INTERNAL_ZLIB, test x"$with_internal_zlib" != x"no")
+
 dnl =========================================================================
 dnl Configure Binreloc support
 dnl -------------------------------------------------------------------------
@@ -2414,6 +2423,7 @@
 AC_CONFIG_FILES([libraries/clib/nio/Makefile])
 AC_CONFIG_FILES([libraries/clib/net/Makefile])
 AC_CONFIG_FILES([libraries/clib/zip/Makefile])
+AC_CONFIG_FILES([libraries/clib/zlib/Makefile])
 AC_CONFIG_FILES([libraries/clib/math/Makefile])
 AC_CONFIG_FILES([libraries/clib/management/Makefile])
 AC_CONFIG_FILES([libraries/clib/security/Makefile])
Index: kaffe/config/Makefile.in
diff -u kaffe/config/Makefile.in:1.202 kaffe/config/Makefile.in:1.203
--- kaffe/config/Makefile.in:1.202	Sun Dec 25 18:10:16 2005
+++ kaffe/config/Makefile.in	Wed Dec 28 20:43:57 2005
@@ -113,6 +113,8 @@
 COND_DIRECT_THREADING_TRUE = @COND_DIRECT_THREADING_TRUE@
 COND_GJDOC_FALSE = @COND_GJDOC_FALSE@
 COND_GJDOC_TRUE = @COND_GJDOC_TRUE@
+COND_INTERNAL_ZLIB_FALSE = @COND_INTERNAL_ZLIB_FALSE@
+COND_INTERNAL_ZLIB_TRUE = @COND_INTERNAL_ZLIB_TRUE@
 COND_KAFFE_NANOX_AWT_FALSE = @COND_KAFFE_NANOX_AWT_FALSE@
 COND_KAFFE_NANOX_AWT_TRUE = @COND_KAFFE_NANOX_AWT_TRUE@
 COND_KAFFE_QT_AWT_FALSE = @COND_KAFFE_QT_AWT_FALSE@
Index: kaffe/include/Makefile.in
diff -u kaffe/include/Makefile.in:1.264 kaffe/include/Makefile.in:1.265
--- kaffe/include/Makefile.in:1.264	Sun Dec 25 18:10:17 2005
+++ kaffe/include/Makefile.in	Wed Dec 28 20:43:58 2005
@@ -128,6 +128,8 @@
 COND_DIRECT_THREADING_TRUE = @COND_DIRECT_THREADING_TRUE@
 COND_GJDOC_FALSE = @COND_GJDOC_FALSE@
 COND_GJDOC_TRUE = @COND_GJDOC_TRUE@
+COND_INTERNAL_ZLIB_FALSE = @COND_INTERNAL_ZLIB_FALSE@
+COND_INTERNAL_ZLIB_TRUE = @COND_INTERNAL_ZLIB_TRUE@
 COND_KAFFE_NANOX_AWT_FALSE = @COND_KAFFE_NANOX_AWT_FALSE@
 COND_KAFFE_NANOX_AWT_TRUE = @COND_KAFFE_NANOX_AWT_TRUE@
 COND_KAFFE_QT_AWT_FALSE = @COND_KAFFE_QT_AWT_FALSE@
Index: kaffe/kaffe/Makefile.in
diff -u kaffe/kaffe/Makefile.in:1.162 kaffe/kaffe/Makefile.in:1.163
--- kaffe/kaffe/Makefile.in:1.162	Sun Dec 25 18:10:18 2005
+++ kaffe/kaffe/Makefile.in	Wed Dec 28 20:43:58 2005
@@ -114,6 +114,8 @@
 COND_DIRECT_THREADING_TRUE = @COND_DIRECT_THREADING_TRUE@
 COND_GJDOC_FALSE = @COND_GJDOC_FALSE@
 COND_GJDOC_TRUE = @COND_GJDOC_TRUE@
+COND_INTERNAL_ZLIB_FALSE = @COND_INTERNAL_ZLIB_FALSE@
+COND_INTERNAL_ZLIB_TRUE = @COND_INTERNAL_ZLIB_TRUE@
 COND_KAFFE_NANOX_AWT_FALSE = @COND_KAFFE_NANOX_AWT_FALSE@
 COND_KAFFE_NANOX_AWT_TRUE = @COND_KAFFE_NANOX_AWT_TRUE@
 COND_KAFFE_QT_AWT_FALSE = @COND_KAFFE_QT_AWT_FALSE@
Index: kaffe/kaffe/jvmpi/Makefile.in
diff -u kaffe/kaffe/jvmpi/Makefile.in:1.86 kaffe/kaffe/jvmpi/Makefile.in:1.87
--- kaffe/kaffe/jvmpi/Makefile.in:1.86	Sun Dec 25 18:10:18 2005
+++ kaffe/kaffe/jvmpi/Makefile.in	Wed Dec 28 20:43:59 2005
@@ -124,6 +124,8 @@
 COND_DIRECT_THREADING_TRUE = @COND_DIRECT_THREADING_TRUE@
 COND_GJDOC_FALSE = @COND_GJDOC_FALSE@
 COND_GJDOC_TRUE = @COND_GJDOC_TRUE@
+COND_INTERNAL_ZLIB_FALSE = @COND_INTERNAL_ZLIB_FALSE@
+COND_INTERNAL_ZLIB_TRUE = @COND_INTERNAL_ZLIB_TRUE@
 COND_KAFFE_NANOX_AWT_FALSE = @COND_KAFFE_NANOX_AWT_FALSE@
 COND_KAFFE_NANOX_AWT_TRUE = @COND_KAFFE_NANOX_AWT_TRUE@
 COND_KAFFE_QT_AWT_FALSE = @COND_KAFFE_QT_AWT_FALSE@
Index: kaffe/kaffe/kaffe/Makefile.in
diff -u kaffe/kaffe/kaffe/Makefile.in:1.184 kaffe/kaffe/kaffe/Makefile.in:1.185
--- kaffe/kaffe/kaffe/Makefile.in:1.184	Sun Dec 25 18:10:19 2005
+++ kaffe/kaffe/kaffe/Makefile.in	Wed Dec 28 20:43:59 2005
@@ -129,6 +129,8 @@
 COND_DIRECT_THREADING_TRUE = @COND_DIRECT_THREADING_TRUE@
 COND_GJDOC_FALSE = @COND_GJDOC_FALSE@
 COND_GJDOC_TRUE = @COND_GJDOC_TRUE@
+COND_INTERNAL_ZLIB_FALSE = @COND_INTERNAL_ZLIB_FALSE@
+COND_INTERNAL_ZLIB_TRUE = @COND_INTERNAL_ZLIB_TRUE@
 COND_KAFFE_NANOX_AWT_FALSE = @COND_KAFFE_NANOX_AWT_FALSE@
 COND_KAFFE_NANOX_AWT_TRUE = @COND_KAFFE_NANOX_AWT_TRUE@
 COND_KAFFE_QT_AWT_FALSE = @COND_KAFFE_QT_AWT_FALSE@
Index: kaffe/kaffe/kaffeh/Makefile.in
diff -u kaffe/kaffe/kaffeh/Makefile.in:1.164 kaffe/kaffe/kaffeh/Makefile.in:1.165
--- kaffe/kaffe/kaffeh/Makefile.in:1.164	Sun Dec 25 18:10:23 2005
+++ kaffe/kaffe/kaffeh/Makefile.in	Wed Dec 28 20:44:02 2005
@@ -135,6 +135,8 @@
 COND_DIRECT_THREADING_TRUE = @COND_DIRECT_THREADING_TRUE@
 COND_GJDOC_FALSE = @COND_GJDOC_FALSE@
 COND_GJDOC_TRUE = @COND_GJDOC_TRUE@
+COND_INTERNAL_ZLIB_FALSE = @COND_INTERNAL_ZLIB_FALSE@
+COND_INTERNAL_ZLIB_TRUE = @COND_INTERNAL_ZLIB_TRUE@
 COND_KAFFE_NANOX_AWT_FALSE = @COND_KAFFE_NANOX_AWT_FALSE@
 COND_KAFFE_NANOX_AWT_TRUE = @COND_KAFFE_NANOX_AWT_TRUE@
 COND_KAFFE_QT_AWT_FALSE = @COND_KAFFE_QT_AWT_FALSE@
Index: kaffe/kaffe/kaffevm/Makefile.in
diff -u kaffe/kaffe/kaffevm/Makefile.in:1.217 kaffe/kaffe/kaffevm/Makefile.in:1.218
--- kaffe/kaffe/kaffevm/Makefile.in:1.217	Mon Dec 26 22:04:37 2005
+++ kaffe/kaffe/kaffevm/Makefile.in	Wed Dec 28 20:44:03 2005
@@ -168,6 +168,8 @@
 COND_DIRECT_THREADING_TRUE = @COND_DIRECT_THREADING_TRUE@
 COND_GJDOC_FALSE = @COND_GJDOC_FALSE@
 COND_GJDOC_TRUE = @COND_GJDOC_TRUE@
+COND_INTERNAL_ZLIB_FALSE = @COND_INTERNAL_ZLIB_FALSE@
+COND_INTERNAL_ZLIB_TRUE = @COND_INTERNAL_ZLIB_TRUE@
 COND_KAFFE_NANOX_AWT_FALSE = @COND_KAFFE_NANOX_AWT_FALSE@
 COND_KAFFE_NANOX_AWT_TRUE = @COND_KAFFE_NANOX_AWT_TRUE@
 COND_KAFFE_QT_AWT_FALSE = @COND_KAFFE_QT_AWT_FALSE@
Index: kaffe/kaffe/kaffevm/boehm-gc/Makefile.in
diff -u kaffe/kaffe/kaffevm/boehm-gc/Makefile.in:1.49 kaffe/kaffe/kaffevm/boehm-gc/Makefile.in:1.50
--- kaffe/kaffe/kaffevm/boehm-gc/Makefile.in:1.49	Sun Dec 25 18:10:24 2005
+++ kaffe/kaffe/kaffevm/boehm-gc/Makefile.in	Wed Dec 28 20:44:04 2005
@@ -137,6 +137,8 @@
 COND_DIRECT_THREADING_TRUE = @COND_DIRECT_THREADING_TRUE@
 COND_GJDOC_FALSE = @COND_GJDOC_FALSE@
 COND_GJDOC_TRUE = @COND_GJDOC_TRUE@
+COND_INTERNAL_ZLIB_FALSE = @COND_INTERNAL_ZLIB_FALSE@
+COND_INTERNAL_ZLIB_TRUE = @COND_INTERNAL_ZLIB_TRUE@
 COND_KAFFE_NANOX_AWT_FALSE = @COND_KAFFE_NANOX_AWT_FALSE@
 COND_KAFFE_NANOX_AWT_TRUE = @COND_KAFFE_NANOX_AWT_TRUE@
 COND_KAFFE_QT_AWT_FALSE = @COND_KAFFE_QT_AWT_FALSE@
Index: kaffe/kaffe/kaffevm/gcj/Makefile.in
diff -u kaffe/kaffe/kaffevm/gcj/Makefile.in:1.142 kaffe/kaffe/kaffevm/gcj/Makefile.in:1.143
--- kaffe/kaffe/kaffevm/gcj/Makefile.in:1.142	Sun Dec 25 18:10:25 2005
+++ kaffe/kaffe/kaffevm/gcj/Makefile.in	Wed Dec 28 20:44:04 2005
@@ -132,6 +132,8 @@
 COND_DIRECT_THREADING_TRUE = @COND_DIRECT_THREADING_TRUE@
 COND_GJDOC_FALSE = @COND_GJDOC_FALSE@
 COND_GJDOC_TRUE = @COND_GJDOC_TRUE@
+COND_INTERNAL_ZLIB_FALSE = @COND_INTERNAL_ZLIB_FALSE@
+COND_INTERNAL_ZLIB_TRUE = @COND_INTERNAL_ZLIB_TRUE@
 COND_KAFFE_NANOX_AWT_FALSE = @COND_KAFFE_NANOX_AWT_FALSE@
 COND_KAFFE_NANOX_AWT_TRUE = @COND_KAFFE_NANOX_AWT_TRUE@
 COND_KAFFE_QT_AWT_FALSE = @COND_KAFFE_QT_AWT_FALSE@
Index: kaffe/kaffe/kaffevm/intrp/Makefile.in
diff -u kaffe/kaffe/kaffevm/intrp/Makefile.in:1.151 kaffe/kaffe/kaffevm/intrp/Makefile.in:1.152
--- kaffe/kaffe/kaffevm/intrp/Makefile.in:1.151	Sun Dec 25 18:10:26 2005
+++ kaffe/kaffe/kaffevm/intrp/Makefile.in	Wed Dec 28 20:44:04 2005
@@ -123,6 +123,8 @@
 COND_DIRECT_THREADING_TRUE = @COND_DIRECT_THREADING_TRUE@
 COND_GJDOC_FALSE = @COND_GJDOC_FALSE@
 COND_GJDOC_TRUE = @COND_GJDOC_TRUE@
+COND_INTERNAL_ZLIB_FALSE = @COND_INTERNAL_ZLIB_FALSE@
+COND_INTERNAL_ZLIB_TRUE = @COND_INTERNAL_ZLIB_TRUE@
 COND_KAFFE_NANOX_AWT_FALSE = @COND_KAFFE_NANOX_AWT_FALSE@
 COND_KAFFE_NANOX_AWT_TRUE = @COND_KAFFE_NANOX_AWT_TRUE@
 COND_KAFFE_QT_AWT_FALSE = @COND_KAFFE_QT_AWT_FALSE@
Index: kaffe/kaffe/kaffevm/jit/Makefile.in
diff -u kaffe/kaffe/kaffevm/jit/Makefile.in:1.161 kaffe/kaffe/kaffevm/jit/Makefile.in:1.162
--- kaffe/kaffe/kaffevm/jit/Makefile.in:1.161	Sun Dec 25 18:10:26 2005
+++ kaffe/kaffe/kaffevm/jit/Makefile.in	Wed Dec 28 20:44:06 2005
@@ -129,6 +129,8 @@
 COND_DIRECT_THREADING_TRUE = @COND_DIRECT_THREADING_TRUE@
 COND_GJDOC_FALSE = @COND_GJDOC_FALSE@
 COND_GJDOC_TRUE = @COND_GJDOC_TRUE@
+COND_INTERNAL_ZLIB_FALSE = @COND_INTERNAL_ZLIB_FALSE@
+COND_INTERNAL_ZLIB_TRUE = @COND_INTERNAL_ZLIB_TRUE@
 COND_KAFFE_NANOX_AWT_FALSE = @COND_KAFFE_NANOX_AWT_FALSE@
 COND_KAFFE_NANOX_AWT_TRUE = @COND_KAFFE_NANOX_AWT_TRUE@
 COND_KAFFE_QT_AWT_FALSE = @COND_KAFFE_QT_AWT_FALSE@
Index: kaffe/kaffe/kaffevm/jit3/Makefile.in
diff -u kaffe/kaffe/kaffevm/jit3/Makefile.in:1.131 kaffe/kaffe/kaffevm/jit3/Makefile.in:1.132
--- kaffe/kaffe/kaffevm/jit3/Makefile.in:1.131	Sun Dec 25 18:10:27 2005
+++ kaffe/kaffe/kaffevm/jit3/Makefile.in	Wed Dec 28 20:44:06 2005
@@ -129,6 +129,8 @@
 COND_DIRECT_THREADING_TRUE = @COND_DIRECT_THREADING_TRUE@
 COND_GJDOC_FALSE = @COND_GJDOC_FALSE@
 COND_GJDOC_TRUE = @COND_GJDOC_TRUE@
+COND_INTERNAL_ZLIB_FALSE = @COND_INTERNAL_ZLIB_FALSE@
+COND_INTERNAL_ZLIB_TRUE = @COND_INTERNAL_ZLIB_TRUE@
 COND_KAFFE_NANOX_AWT_FALSE = @COND_KAFFE_NANOX_AWT_FALSE@
 COND_KAFFE_NANOX_AWT_TRUE = @COND_KAFFE_NANOX_AWT_TRUE@
 COND_KAFFE_QT_AWT_FALSE = @COND_KAFFE_QT_AWT_FALSE@
Index: kaffe/kaffe/kaffevm/jni/Makefile.in
diff -u kaffe/kaffe/kaffevm/jni/Makefile.in:1.55 kaffe/kaffe/kaffevm/jni/Makefile.in:1.56
--- kaffe/kaffe/kaffevm/jni/Makefile.in:1.55	Sun Dec 25 18:10:30 2005
+++ kaffe/kaffe/kaffevm/jni/Makefile.in	Wed Dec 28 20:44:07 2005
@@ -127,6 +127,8 @@
 COND_DIRECT_THREADING_TRUE = @COND_DIRECT_THREADING_TRUE@
 COND_GJDOC_FALSE = @COND_GJDOC_FALSE@
 COND_GJDOC_TRUE = @COND_GJDOC_TRUE@
+COND_INTERNAL_ZLIB_FALSE = @COND_INTERNAL_ZLIB_FALSE@
+COND_INTERNAL_ZLIB_TRUE = @COND_INTERNAL_ZLIB_TRUE@
 COND_KAFFE_NANOX_AWT_FALSE = @COND_KAFFE_NANOX_AWT_FALSE@
 COND_KAFFE_NANOX_AWT_TRUE = @COND_KAFFE_NANOX_AWT_TRUE@
 COND_KAFFE_QT_AWT_FALSE = @COND_KAFFE_QT_AWT_FALSE@
Index: kaffe/kaffe/kaffevm/kaffe-gc/Makefile.in
diff -u kaffe/kaffe/kaffevm/kaffe-gc/Makefile.in:1.48 kaffe/kaffe/kaffevm/kaffe-gc/Makefile.in:1.49
--- kaffe/kaffe/kaffevm/kaffe-gc/Makefile.in:1.48	Sun Dec 25 18:10:31 2005
+++ kaffe/kaffe/kaffevm/kaffe-gc/Makefile.in	Wed Dec 28 20:44:07 2005
@@ -123,6 +123,8 @@
 COND_DIRECT_THREADING_TRUE = @COND_DIRECT_THREADING_TRUE@
 COND_GJDOC_FALSE = @COND_GJDOC_FALSE@
 COND_GJDOC_TRUE = @COND_GJDOC_TRUE@
+COND_INTERNAL_ZLIB_FALSE = @COND_INTERNAL_ZLIB_FALSE@
+COND_INTERNAL_ZLIB_TRUE = @COND_INTERNAL_ZLIB_TRUE@
 COND_KAFFE_NANOX_AWT_FALSE = @COND_KAFFE_NANOX_AWT_FALSE@
 COND_KAFFE_NANOX_AWT_TRUE = @COND_KAFFE_NANOX_AWT_TRUE@
 COND_KAFFE_QT_AWT_FALSE = @COND_KAFFE_QT_AWT_FALSE@
Index: kaffe/kaffe/kaffevm/systems/Makefile.in
diff -u kaffe/kaffe/kaffevm/systems/Makefile.in:1.151 kaffe/kaffe/kaffevm/systems/Makefile.in:1.152
--- kaffe/kaffe/kaffevm/systems/Makefile.in:1.151	Sun Dec 25 18:10:31 2005
+++ kaffe/kaffe/kaffevm/systems/Makefile.in	Wed Dec 28 20:44:07 2005
@@ -113,6 +113,8 @@
 COND_DIRECT_THREADING_TRUE = @COND_DIRECT_THREADING_TRUE@
 COND_GJDOC_FALSE = @COND_GJDOC_FALSE@
 COND_GJDOC_TRUE = @COND_GJDOC_TRUE@
+COND_INTERNAL_ZLIB_FALSE = @COND_INTERNAL_ZLIB_FALSE@
+COND_INTERNAL_ZLIB_TRUE = @COND_INTERNAL_ZLIB_TRUE@
 COND_KAFFE_NANOX_AWT_FALSE = @COND_KAFFE_NANOX_AWT_FALSE@
 COND_KAFFE_NANOX_AWT_TRUE = @COND_KAFFE_NANOX_AWT_TRUE@
 COND_KAFFE_QT_AWT_FALSE = @COND_KAFFE_QT_AWT_FALSE@
Index: kaffe/kaffe/kaffevm/systems/beos-native/Makefile.in
diff -u kaffe/kaffe/kaffevm/systems/beos-native/Makefile.in:1.142 kaffe/kaffe/kaffevm/systems/beos-native/Makefile.in:1.143
--- kaffe/kaffe/kaffevm/systems/beos-native/Makefile.in:1.142	Sun Dec 25 18:10:32 2005
+++ kaffe/kaffe/kaffevm/systems/beos-native/Makefile.in	Wed Dec 28 20:44:08 2005
@@ -122,6 +122,8 @@
 COND_DIRECT_THREADING_TRUE = @COND_DIRECT_THREADING_TRUE@
 COND_GJDOC_FALSE = @COND_GJDOC_FALSE@
 COND_GJDOC_TRUE = @COND_GJDOC_TRUE@
+COND_INTERNAL_ZLIB_FALSE = @COND_INTERNAL_ZLIB_FALSE@
+COND_INTERNAL_ZLIB_TRUE = @COND_INTERNAL_ZLIB_TRUE@
 COND_KAFFE_NANOX_AWT_FALSE = @COND_KAFFE_NANOX_AWT_FALSE@
 COND_KAFFE_NANOX_AWT_TRUE = @COND_KAFFE_NANOX_AWT_TRUE@
 COND_KAFFE_QT_AWT_FALSE = @COND_KAFFE_QT_AWT_FALSE@
Index: kaffe/kaffe/kaffevm/systems/drops-l4threads/Makefile.in
diff -u kaffe/kaffe/kaffevm/systems/drops-l4threads/Makefile.in:1.5 kaffe/kaffe/kaffevm/systems/drops-l4threads/Makefile.in:1.6
--- kaffe/kaffe/kaffevm/systems/drops-l4threads/Makefile.in:1.5	Sun Dec 25 18:10:32 2005
+++ kaffe/kaffe/kaffevm/systems/drops-l4threads/Makefile.in	Wed Dec 28 20:44:08 2005
@@ -117,6 +117,8 @@
 COND_DIRECT_THREADING_TRUE = @COND_DIRECT_THREADING_TRUE@
 COND_GJDOC_FALSE = @COND_GJDOC_FALSE@
 COND_GJDOC_TRUE = @COND_GJDOC_TRUE@
+COND_INTERNAL_ZLIB_FALSE = @COND_INTERNAL_ZLIB_FALSE@
+COND_INTERNAL_ZLIB_TRUE = @COND_INTERNAL_ZLIB_TRUE@
 COND_KAFFE_NANOX_AWT_FALSE = @COND_KAFFE_NANOX_AWT_FALSE@
 COND_KAFFE_NANOX_AWT_TRUE = @COND_KAFFE_NANOX_AWT_TRUE@
 COND_KAFFE_QT_AWT_FALSE = @COND_KAFFE_QT_AWT_FALSE@
Index: kaffe/kaffe/kaffevm/systems/oskit-pthreads/Makefile.in
diff -u kaffe/kaffe/kaffevm/systems/oskit-pthreads/Makefile.in:1.148 kaffe/kaffe/kaffevm/systems/oskit-pthreads/Makefile.in:1.149
--- kaffe/kaffe/kaffevm/systems/oskit-pthreads/Makefile.in:1.148	Sun Dec 25 18:10:33 2005
+++ kaffe/kaffe/kaffevm/systems/oskit-pthreads/Makefile.in	Wed Dec 28 20:44:08 2005
@@ -122,6 +122,8 @@
 COND_DIRECT_THREADING_TRUE = @COND_DIRECT_THREADING_TRUE@
 COND_GJDOC_FALSE = @COND_GJDOC_FALSE@
 COND_GJDOC_TRUE = @COND_GJDOC_TRUE@
+COND_INTERNAL_ZLIB_FALSE = @COND_INTERNAL_ZLIB_FALSE@
+COND_INTERNAL_ZLIB_TRUE = @COND_INTERNAL_ZLIB_TRUE@
 COND_KAFFE_NANOX_AWT_FALSE = @COND_KAFFE_NANOX_AWT_FALSE@
 COND_KAFFE_NANOX_AWT_TRUE = @COND_KAFFE_NANOX_AWT_TRUE@
 COND_KAFFE_QT_AWT_FALSE = @COND_KAFFE_QT_AWT_FALSE@
Index: kaffe/kaffe/kaffevm/systems/unix-jthreads/Makefile.in
diff -u kaffe/kaffe/kaffevm/systems/unix-jthreads/Makefile.in:1.152 kaffe/kaffe/kaffevm/systems/unix-jthreads/Makefile.in:1.153
--- kaffe/kaffe/kaffevm/systems/unix-jthreads/Makefile.in:1.152	Sun Dec 25 18:10:33 2005
+++ kaffe/kaffe/kaffevm/systems/unix-jthreads/Makefile.in	Wed Dec 28 20:44:09 2005
@@ -123,6 +123,8 @@
 COND_DIRECT_THREADING_TRUE = @COND_DIRECT_THREADING_TRUE@
 COND_GJDOC_FALSE = @COND_GJDOC_FALSE@
 COND_GJDOC_TRUE = @COND_GJDOC_TRUE@
+COND_INTERNAL_ZLIB_FALSE = @COND_INTERNAL_ZLIB_FALSE@
+COND_INTERNAL_ZLIB_TRUE = @COND_INTERNAL_ZLIB_TRUE@
 COND_KAFFE_NANOX_AWT_FALSE = @COND_KAFFE_NANOX_AWT_FALSE@
 COND_KAFFE_NANOX_AWT_TRUE = @COND_KAFFE_NANOX_AWT_TRUE@
 COND_KAFFE_QT_AWT_FALSE = @COND_KAFFE_QT_AWT_FALSE@
Index: kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.in
diff -u kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.127 kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.128
--- kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.127	Sun Dec 25 18:10:38 2005
+++ kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.in	Wed Dec 28 20:44:09 2005
@@ -128,6 +128,8 @@
 COND_DIRECT_THREADING_TRUE = @COND_DIRECT_THREADING_TRUE@
 COND_GJDOC_FALSE = @COND_GJDOC_FALSE@
 COND_GJDOC_TRUE = @COND_GJDOC_TRUE@
+COND_INTERNAL_ZLIB_FALSE = @COND_INTERNAL_ZLIB_FALSE@
+COND_INTERNAL_ZLIB_TRUE = @COND_INTERNAL_ZLIB_TRUE@
 COND_KAFFE_NANOX_AWT_FALSE = @COND_KAFFE_NANOX_AWT_FALSE@
 COND_KAFFE_NANOX_AWT_TRUE = @COND_KAFFE_NANOX_AWT_TRUE@
 COND_KAFFE_QT_AWT_FALSE = @COND_KAFFE_QT_AWT_FALSE@
Index: kaffe/kaffe/kaffevm/verifier/Makefile.in
diff -u kaffe/kaffe/kaffevm/verifier/Makefile.in:1.54 kaffe/kaffe/kaffevm/verifier/Makefile.in:1.55
--- kaffe/kaffe/kaffevm/verifier/Makefile.in:1.54	Sun Dec 25 18:10:38 2005
+++ kaffe/kaffe/kaffevm/verifier/Makefile.in	Wed Dec 28 20:44:11 2005
@@ -124,6 +124,8 @@
 COND_DIRECT_THREADING_TRUE = @COND_DIRECT_THREADING_TRUE@
 COND_GJDOC_FALSE = @COND_GJDOC_FALSE@
 COND_GJDOC_TRUE = @COND_GJDOC_TRUE@
+COND_INTERNAL_ZLIB_FALSE = @COND_INTERNAL_ZLIB_FALSE@
+COND_INTERNAL_ZLIB_TRUE = @COND_INTERNAL_ZLIB_TRUE@
 COND_KAFFE_NANOX_AWT_FALSE = @COND_KAFFE_NANOX_AWT_FALSE@
 COND_KAFFE_NANOX_AWT_TRUE = @COND_KAFFE_NANOX_AWT_TRUE@
 COND_KAFFE_QT_AWT_FALSE = @COND_KAFFE_QT_AWT_FALSE@
Index: kaffe/kaffe/man/Makefile.in
diff -u kaffe/kaffe/man/Makefile.in:1.149 kaffe/kaffe/man/Makefile.in:1.150
--- kaffe/kaffe/man/Makefile.in:1.149	Sun Dec 25 18:10:39 2005
+++ kaffe/kaffe/man/Makefile.in	Wed Dec 28 20:44:11 2005
@@ -110,6 +110,8 @@
 COND_DIRECT_THREADING_TRUE = @COND_DIRECT_THREADING_TRUE@
 COND_GJDOC_FALSE = @COND_GJDOC_FALSE@
 COND_GJDOC_TRUE = @COND_GJDOC_TRUE@
+COND_INTERNAL_ZLIB_FALSE = @COND_INTERNAL_ZLIB_FALSE@
+COND_INTERNAL_ZLIB_TRUE = @COND_INTERNAL_ZLIB_TRUE@
 COND_KAFFE_NANOX_AWT_FALSE = @COND_KAFFE_NANOX_AWT_FALSE@
 COND_KAFFE_NANOX_AWT_TRUE = @COND_KAFFE_NANOX_AWT_TRUE@
 COND_KAFFE_QT_AWT_FALSE = @COND_KAFFE_QT_AWT_FALSE@
Index: kaffe/kaffe/scripts/Makefile.in
diff -u kaffe/kaffe/scripts/Makefile.in:1.189 kaffe/kaffe/scripts/Makefile.in:1.190
--- kaffe/kaffe/scripts/Makefile.in:1.189	Sun Dec 25 18:10:40 2005
+++ kaffe/kaffe/scripts/Makefile.in	Wed Dec 28 20:44:12 2005
@@ -125,6 +125,8 @@
 COND_DIRECT_THREADING_TRUE = @COND_DIRECT_THREADING_TRUE@
 COND_GJDOC_FALSE = @COND_GJDOC_FALSE@
 COND_GJDOC_TRUE = @COND_GJDOC_TRUE@
+COND_INTERNAL_ZLIB_FALSE = @COND_INTERNAL_ZLIB_FALSE@
+COND_INTERNAL_ZLIB_TRUE = @COND_INTERNAL_ZLIB_TRUE@
 COND_KAFFE_NANOX_AWT_FALSE = @COND_KAFFE_NANOX_AWT_FALSE@
 COND_KAFFE_NANOX_AWT_TRUE = @COND_KAFFE_NANOX_AWT_TRUE@
 COND_KAFFE_QT_AWT_FALSE = @COND_KAFFE_QT_AWT_FALSE@
Index: kaffe/kaffe/scripts/bat/Makefile.in
diff -u kaffe/kaffe/scripts/bat/Makefile.in:1.141 kaffe/kaffe/scripts/bat/Makefile.in:1.142
--- kaffe/kaffe/scripts/bat/Makefile.in:1.141	Sun Dec 25 18:10:40 2005

*** Patch too long, truncated ***

More information about the kaffe mailing list