[kaffe] CVS kaffe (robilad): Merged in fastjar
Kaffe CVS
cvs-commits at kaffe.org
Tue Jan 3 07:36:04 PST 2006
PatchSet 7071
Date: 2006/01/03 15:26:37
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Merged in fastjar
2006-01-03 Dalibor Topic <robilad at kaffe.org>
* Makefile.am: (SUBDIRS) Added external subdir.
(DIST_SUBDIRS) Added external subdir.
* THIRDPARTY: Added information on fastjar. Adapted information on
zlib.
* configure.ac: (--with-internal-zlib) Replaced by
(--with-system-zlib), so that kaffe now uses the merged in
zlib by default, like gcc does.
(--disable-fastjar) New option.
Added fastjar subdir for configuration, and the Makefile for output.
* kaffe/scripts/jar.in: Delegate to fastjar
* libraries/clib/Makefile.am (SUBDIRS): Removed zlib.
* libraries/clib/zip/Makefile.am (COND_INTERNAL_ZLIB) Replaced by
(COND_SYSTEM_ZLIB). Adapted to use internal zlib from external/gcc
directory.
* libraries/javalib/Makefile.am: Regenerated.
* libraries/javalib/vmspecific/org/kaffe/tools/jar/Jar.java
libraries/javalib/vmspecific/org/kaffe/tools/jar/XPFile.java
libraries/javalib/vmspecific/org/kaffe/tools/jar/XPFileInputStream.java
libraries/javalib/vmspecific/org/kaffe/tools/jar/XPFileOutputStream.java
libraries/javalib/vmspecific/org/kaffe/tools/jar/XPFileReader.java
libraries/javalib/vmspecific/org/kaffe/tools/jar/XPFileWriter.java:
Removed.
* libraries/clib/zlib : Moved over to external/gcc/zlib.
* external/gcc/fastjar: New files. Merged in from gcc 4.0.2.
Slightly adapted the build system to behave well when merged into Kaffe.
Members:
ChangeLog:1.4590->1.4591
Makefile.am:1.105->1.106
Makefile.in:1.238->1.239
THIRDPARTY:1.41->1.42
configure:1.522->1.523
configure.ac:1.200->1.201
config/Makefile.in:1.203->1.204
external/Makefile.am:INITIAL->1.1
external/Makefile.in:INITIAL->1.1
external/gcc/Makefile.am:INITIAL->1.1
external/gcc/Makefile.in:INITIAL->1.1
external/gcc/fastjar/.cvsignore:INITIAL->1.1
external/gcc/fastjar/AUTHORS:INITIAL->1.1
external/gcc/fastjar/CHANGES:INITIAL->1.1
external/gcc/fastjar/COPYING:INITIAL->1.1
external/gcc/fastjar/ChangeLog:INITIAL->1.1
external/gcc/fastjar/INSTALL:INITIAL->1.1
external/gcc/fastjar/Makefile.am:INITIAL->1.1
external/gcc/fastjar/Makefile.in:INITIAL->1.1
external/gcc/fastjar/NEWS:INITIAL->1.1
external/gcc/fastjar/README:INITIAL->1.1
external/gcc/fastjar/aclocal.m4:INITIAL->1.1
external/gcc/fastjar/compile:INITIAL->1.1
external/gcc/fastjar/compress.c:INITIAL->1.1
external/gcc/fastjar/compress.h:INITIAL->1.1
external/gcc/fastjar/config.guess:INITIAL->1.1
external/gcc/fastjar/config.h.in:INITIAL->1.1
external/gcc/fastjar/config.sub:INITIAL->1.1
external/gcc/fastjar/configure:INITIAL->1.1
external/gcc/fastjar/configure.ac:INITIAL->1.1
external/gcc/fastjar/depcomp:INITIAL->1.1
external/gcc/fastjar/dostime.c:INITIAL->1.1
external/gcc/fastjar/dostime.h:INITIAL->1.1
external/gcc/fastjar/fastjar.1:INITIAL->1.1
external/gcc/fastjar/fastjar.info:INITIAL->1.1
external/gcc/fastjar/fastjar.texi:INITIAL->1.1
external/gcc/fastjar/gcc-common.texi:INITIAL->1.1
external/gcc/fastjar/gpl.texi:INITIAL->1.1
external/gcc/fastjar/grepjar.1:INITIAL->1.1
external/gcc/fastjar/install-defs.sh.in:INITIAL->1.1
external/gcc/fastjar/install-sh:INITIAL->1.1
external/gcc/fastjar/jargrep.c:INITIAL->1.1
external/gcc/fastjar/jargrep.h:INITIAL->1.1
external/gcc/fastjar/jartool.c:INITIAL->1.1
external/gcc/fastjar/jartool.h:INITIAL->1.1
external/gcc/fastjar/ltmain.sh:INITIAL->1.1
external/gcc/fastjar/missing:INITIAL->1.1
external/gcc/fastjar/pushback.c:INITIAL->1.1
external/gcc/fastjar/pushback.h:INITIAL->1.1
external/gcc/fastjar/shift.c:INITIAL->1.1
external/gcc/fastjar/shift.h:INITIAL->1.1
external/gcc/fastjar/zipfile.h:INITIAL->1.1
external/gcc/fastjar/m4/accross.m4:INITIAL->1.1
external/gcc/fastjar/m4/gcc_AC_FUNC_MKDIR_TAKES_ONE_ARG.m4:INITIAL->1.1
external/gcc/zlib/ChangeLog:INITIAL->1.1
external/gcc/zlib/ChangeLog.gcj:INITIAL->1.1
external/gcc/zlib/ChangeLog.kaffe:INITIAL->1.1
external/gcc/zlib/FAQ:INITIAL->1.1
external/gcc/zlib/INDEX:INITIAL->1.1
external/gcc/zlib/Makefile.am:INITIAL->1.1
external/gcc/zlib/Makefile.in:INITIAL->1.1
external/gcc/zlib/README:INITIAL->1.1
external/gcc/zlib/acinclude.m4:INITIAL->1.1
external/gcc/zlib/aclocal.m4:INITIAL->1.1
external/gcc/zlib/adler32.c:INITIAL->1.1
external/gcc/zlib/algorithm.txt:INITIAL->1.1
external/gcc/zlib/compress.c:INITIAL->1.1
external/gcc/zlib/configure:INITIAL->1.1
external/gcc/zlib/configure.ac:INITIAL->1.1
external/gcc/zlib/crc32.c:INITIAL->1.1
external/gcc/zlib/crc32.h:INITIAL->1.1
external/gcc/zlib/deflate.c:INITIAL->1.1
external/gcc/zlib/deflate.h:INITIAL->1.1
external/gcc/zlib/example.c:INITIAL->1.1
external/gcc/zlib/gzio.c:INITIAL->1.1
external/gcc/zlib/infback.c:INITIAL->1.1
external/gcc/zlib/inffast.c:INITIAL->1.1
external/gcc/zlib/inffast.h:INITIAL->1.1
external/gcc/zlib/inffixed.h:INITIAL->1.1
external/gcc/zlib/inflate.c:INITIAL->1.1
external/gcc/zlib/inflate.h:INITIAL->1.1
external/gcc/zlib/inftrees.c:INITIAL->1.1
external/gcc/zlib/inftrees.h:INITIAL->1.1
external/gcc/zlib/make_vms.com:INITIAL->1.1
external/gcc/zlib/minigzip.c:INITIAL->1.1
external/gcc/zlib/trees.c:INITIAL->1.1
external/gcc/zlib/trees.h:INITIAL->1.1
external/gcc/zlib/uncompr.c:INITIAL->1.1
external/gcc/zlib/zconf.h:INITIAL->1.1
external/gcc/zlib/zconf.in.h:INITIAL->1.1
external/gcc/zlib/zlib.3:INITIAL->1.1
external/gcc/zlib/zlib.h:INITIAL->1.1
external/gcc/zlib/zutil.c:INITIAL->1.1
external/gcc/zlib/zutil.h:INITIAL->1.1
external/gcc/zlib/amiga/Makefile.pup:INITIAL->1.1
external/gcc/zlib/amiga/Makefile.sas:INITIAL->1.1
external/gcc/zlib/as400/bndsrc:INITIAL->1.1
external/gcc/zlib/as400/compile.clp:INITIAL->1.1
external/gcc/zlib/as400/readme.txt:INITIAL->1.1
external/gcc/zlib/as400/zlib.inc:INITIAL->1.1
external/gcc/zlib/contrib/README.contrib:INITIAL->1.1
external/gcc/zlib/contrib/ada/buffer_demo.adb:INITIAL->1.1
external/gcc/zlib/contrib/ada/mtest.adb:INITIAL->1.1
external/gcc/zlib/contrib/ada/read.adb:INITIAL->1.1
external/gcc/zlib/contrib/ada/readme.txt:INITIAL->1.1
external/gcc/zlib/contrib/ada/test.adb:INITIAL->1.1
external/gcc/zlib/contrib/ada/zlib-streams.adb:INITIAL->1.1
external/gcc/zlib/contrib/ada/zlib-streams.ads:INITIAL->1.1
external/gcc/zlib/contrib/ada/zlib-thin.adb:INITIAL->1.1
external/gcc/zlib/contrib/ada/zlib-thin.ads:INITIAL->1.1
external/gcc/zlib/contrib/ada/zlib.adb:INITIAL->1.1
external/gcc/zlib/contrib/ada/zlib.ads:INITIAL->1.1
external/gcc/zlib/contrib/ada/zlib.gpr:INITIAL->1.1
external/gcc/zlib/contrib/asm586/README.586:INITIAL->1.1
external/gcc/zlib/contrib/asm586/match.S:INITIAL->1.1
external/gcc/zlib/contrib/asm686/README.686:INITIAL->1.1
external/gcc/zlib/contrib/asm686/match.S:INITIAL->1.1
external/gcc/zlib/contrib/blast/Makefile:INITIAL->1.1
external/gcc/zlib/contrib/blast/README:INITIAL->1.1
external/gcc/zlib/contrib/blast/blast.c:INITIAL->1.1
external/gcc/zlib/contrib/blast/blast.h:INITIAL->1.1
external/gcc/zlib/contrib/blast/test.pk:INITIAL->1.1
external/gcc/zlib/contrib/blast/test.txt:INITIAL->1.1
external/gcc/zlib/contrib/delphi/ZLib.pas:INITIAL->1.1
external/gcc/zlib/contrib/delphi/ZLibConst.pas:INITIAL->1.1
external/gcc/zlib/contrib/delphi/readme.txt:INITIAL->1.1
external/gcc/zlib/contrib/delphi/zlibd32.mak:INITIAL->1.1
external/gcc/zlib/contrib/dotzlib/DotZLib.build:INITIAL->1.1
external/gcc/zlib/contrib/dotzlib/DotZLib.chm:INITIAL->1.1
external/gcc/zlib/contrib/dotzlib/DotZLib.sln:INITIAL->1.1
external/gcc/zlib/contrib/dotzlib/LICENSE_1_0.txt:INITIAL->1.1
external/gcc/zlib/contrib/dotzlib/readme.txt:INITIAL->1.1
external/gcc/zlib/contrib/dotzlib/DotZLib/AssemblyInfo.cs:INITIAL->1.1
external/gcc/zlib/contrib/dotzlib/DotZLib/ChecksumImpl.cs:INITIAL->1.1
external/gcc/zlib/contrib/dotzlib/DotZLib/CircularBuffer.cs:INITIAL->1.1
external/gcc/zlib/contrib/dotzlib/DotZLib/CodecBase.cs:INITIAL->1.1
external/gcc/zlib/contrib/dotzlib/DotZLib/Deflater.cs:INITIAL->1.1
external/gcc/zlib/contrib/dotzlib/DotZLib/DotZLib.cs:INITIAL->1.1
external/gcc/zlib/contrib/dotzlib/DotZLib/DotZLib.csproj:INITIAL->1.1
external/gcc/zlib/contrib/dotzlib/DotZLib/GZipStream.cs:INITIAL->1.1
external/gcc/zlib/contrib/dotzlib/DotZLib/Inflater.cs:INITIAL->1.1
external/gcc/zlib/contrib/dotzlib/DotZLib/UnitTests.cs:INITIAL->1.1
external/gcc/zlib/contrib/infback9/README:INITIAL->1.1
external/gcc/zlib/contrib/infback9/infback9.c:INITIAL->1.1
external/gcc/zlib/contrib/infback9/infback9.h:INITIAL->1.1
external/gcc/zlib/contrib/infback9/inffix9.h:INITIAL->1.1
external/gcc/zlib/contrib/infback9/inflate9.h:INITIAL->1.1
external/gcc/zlib/contrib/infback9/inftree9.c:INITIAL->1.1
external/gcc/zlib/contrib/infback9/inftree9.h:INITIAL->1.1
external/gcc/zlib/contrib/inflate86/inffas86.c:INITIAL->1.1
external/gcc/zlib/contrib/inflate86/inffast.S:INITIAL->1.1
external/gcc/zlib/contrib/iostream/test.cpp:INITIAL->1.1
external/gcc/zlib/contrib/iostream/zfstream.cpp:INITIAL->1.1
external/gcc/zlib/contrib/iostream/zfstream.h:INITIAL->1.1
external/gcc/zlib/contrib/iostream2/zstream.h:INITIAL->1.1
external/gcc/zlib/contrib/iostream2/zstream_test.cpp:INITIAL->1.1
external/gcc/zlib/contrib/iostream3/README:INITIAL->1.1
external/gcc/zlib/contrib/iostream3/TODO:INITIAL->1.1
external/gcc/zlib/contrib/iostream3/test.cc:INITIAL->1.1
external/gcc/zlib/contrib/iostream3/zfstream.cc:INITIAL->1.1
external/gcc/zlib/contrib/iostream3/zfstream.h:INITIAL->1.1
external/gcc/zlib/contrib/masm686/match.asm:INITIAL->1.1
external/gcc/zlib/contrib/masmx64/bld_ml64.bat:INITIAL->1.1
external/gcc/zlib/contrib/masmx64/gvmat64.asm:INITIAL->1.1
external/gcc/zlib/contrib/masmx64/gvmat64.obj:INITIAL->1.1
external/gcc/zlib/contrib/masmx64/inffas8664.c:INITIAL->1.1
external/gcc/zlib/contrib/masmx64/inffasx64.asm:INITIAL->1.1
external/gcc/zlib/contrib/masmx64/inffasx64.obj:INITIAL->1.1
external/gcc/zlib/contrib/masmx64/readme.txt:INITIAL->1.1
external/gcc/zlib/contrib/masmx86/bld_ml32.bat:INITIAL->1.1
external/gcc/zlib/contrib/masmx86/gvmat32.asm:INITIAL->1.1
external/gcc/zlib/contrib/masmx86/gvmat32.obj:INITIAL->1.1
external/gcc/zlib/contrib/masmx86/gvmat32c.c:INITIAL->1.1
external/gcc/zlib/contrib/masmx86/inffas32.asm:INITIAL->1.1
external/gcc/zlib/contrib/masmx86/inffas32.obj:INITIAL->1.1
external/gcc/zlib/contrib/masmx86/mkasm.bat:INITIAL->1.1
external/gcc/zlib/contrib/masmx86/readme.txt:INITIAL->1.1
external/gcc/zlib/contrib/minizip/ChangeLogUnzip:INITIAL->1.1
external/gcc/zlib/contrib/minizip/Makefile:INITIAL->1.1
external/gcc/zlib/contrib/minizip/crypt.h:INITIAL->1.1
external/gcc/zlib/contrib/minizip/ioapi.c:INITIAL->1.1
external/gcc/zlib/contrib/minizip/ioapi.h:INITIAL->1.1
external/gcc/zlib/contrib/minizip/iowin32.c:INITIAL->1.1
external/gcc/zlib/contrib/minizip/iowin32.h:INITIAL->1.1
external/gcc/zlib/contrib/minizip/miniunz.c:INITIAL->1.1
external/gcc/zlib/contrib/minizip/minizip.c:INITIAL->1.1
external/gcc/zlib/contrib/minizip/mztools.c:INITIAL->1.1
external/gcc/zlib/contrib/minizip/mztools.h:INITIAL->1.1
external/gcc/zlib/contrib/minizip/unzip.c:INITIAL->1.1
external/gcc/zlib/contrib/minizip/unzip.h:INITIAL->1.1
external/gcc/zlib/contrib/minizip/zip.c:INITIAL->1.1
external/gcc/zlib/contrib/minizip/zip.h:INITIAL->1.1
external/gcc/zlib/contrib/pascal/example.pas:INITIAL->1.1
external/gcc/zlib/contrib/pascal/readme.txt:INITIAL->1.1
external/gcc/zlib/contrib/pascal/zlibd32.mak:INITIAL->1.1
external/gcc/zlib/contrib/pascal/zlibpas.pas:INITIAL->1.1
external/gcc/zlib/contrib/puff/Makefile:INITIAL->1.1
external/gcc/zlib/contrib/puff/README:INITIAL->1.1
external/gcc/zlib/contrib/puff/puff.c:INITIAL->1.1
external/gcc/zlib/contrib/puff/puff.h:INITIAL->1.1
external/gcc/zlib/contrib/puff/zeros.raw:INITIAL->1.1
external/gcc/zlib/contrib/testzlib/testzlib.c:INITIAL->1.1
external/gcc/zlib/contrib/testzlib/testzlib.txt:INITIAL->1.1
external/gcc/zlib/contrib/untgz/Makefile:INITIAL->1.1
external/gcc/zlib/contrib/untgz/Makefile.msc:INITIAL->1.1
external/gcc/zlib/contrib/untgz/untgz.c:INITIAL->1.1
external/gcc/zlib/contrib/vstudio/readme.txt:INITIAL->1.1
external/gcc/zlib/contrib/vstudio/vc7/miniunz.vcproj:INITIAL->1.1
external/gcc/zlib/contrib/vstudio/vc7/minizip.vcproj:INITIAL->1.1
external/gcc/zlib/contrib/vstudio/vc7/testzlib.vcproj:INITIAL->1.1
external/gcc/zlib/contrib/vstudio/vc7/zlib.rc:INITIAL->1.1
external/gcc/zlib/contrib/vstudio/vc7/zlibstat.vcproj:INITIAL->1.1
external/gcc/zlib/contrib/vstudio/vc7/zlibvc.def:INITIAL->1.1
external/gcc/zlib/contrib/vstudio/vc7/zlibvc.sln:INITIAL->1.1
external/gcc/zlib/contrib/vstudio/vc7/zlibvc.vcproj:INITIAL->1.1
external/gcc/zlib/contrib/vstudio/vc8/miniunz.vcproj:INITIAL->1.1
external/gcc/zlib/contrib/vstudio/vc8/minizip.vcproj:INITIAL->1.1
external/gcc/zlib/contrib/vstudio/vc8/testzlib.vcproj:INITIAL->1.1
external/gcc/zlib/contrib/vstudio/vc8/testzlibdll.vcproj:INITIAL->1.1
external/gcc/zlib/contrib/vstudio/vc8/zlib.rc:INITIAL->1.1
external/gcc/zlib/contrib/vstudio/vc8/zlibstat.vcproj:INITIAL->1.1
external/gcc/zlib/contrib/vstudio/vc8/zlibvc.def:INITIAL->1.1
external/gcc/zlib/contrib/vstudio/vc8/zlibvc.sln:INITIAL->1.1
external/gcc/zlib/contrib/vstudio/vc8/zlibvc.vcproj:INITIAL->1.1
external/gcc/zlib/examples/README.examples:INITIAL->1.1
external/gcc/zlib/examples/fitblk.c:INITIAL->1.1
external/gcc/zlib/examples/gun.c:INITIAL->1.1
external/gcc/zlib/examples/gzappend.c:INITIAL->1.1
external/gcc/zlib/examples/gzjoin.c:INITIAL->1.1
external/gcc/zlib/examples/gzlog.c:INITIAL->1.1
external/gcc/zlib/examples/gzlog.h:INITIAL->1.1
external/gcc/zlib/examples/zlib_how.html:INITIAL->1.1
external/gcc/zlib/examples/zpipe.c:INITIAL->1.1
external/gcc/zlib/examples/zran.c:INITIAL->1.1
external/gcc/zlib/msdos/Makefile.bor:INITIAL->1.1
external/gcc/zlib/msdos/Makefile.dj2:INITIAL->1.1
external/gcc/zlib/msdos/Makefile.emx:INITIAL->1.1
external/gcc/zlib/msdos/Makefile.msc:INITIAL->1.1
external/gcc/zlib/msdos/Makefile.tc:INITIAL->1.1
external/gcc/zlib/old/Makefile.riscos:INITIAL->1.1
external/gcc/zlib/old/README:INITIAL->1.1
external/gcc/zlib/old/descrip.mms:INITIAL->1.1
external/gcc/zlib/old/visual-basic.txt:INITIAL->1.1
external/gcc/zlib/old/zlib.html:INITIAL->1.1
external/gcc/zlib/old/os2/Makefile.os2:INITIAL->1.1
external/gcc/zlib/old/os2/zlib.def:INITIAL->1.1
external/gcc/zlib/projects/README.projects:INITIAL->1.1
external/gcc/zlib/projects/visualc6/README.txt:INITIAL->1.1
external/gcc/zlib/projects/visualc6/example.dsp:INITIAL->1.1
external/gcc/zlib/projects/visualc6/minigzip.dsp:INITIAL->1.1
external/gcc/zlib/projects/visualc6/zlib.dsp:INITIAL->1.1
external/gcc/zlib/projects/visualc6/zlib.dsw:INITIAL->1.1
external/gcc/zlib/qnx/package.qpg:INITIAL->1.1
external/gcc/zlib/win32/DLL_FAQ.txt:INITIAL->1.1
external/gcc/zlib/win32/Makefile.bor:INITIAL->1.1
external/gcc/zlib/win32/Makefile.emx:INITIAL->1.1
external/gcc/zlib/win32/Makefile.gcc:INITIAL->1.1
external/gcc/zlib/win32/Makefile.msc:INITIAL->1.1
external/gcc/zlib/win32/VisualC.txt:INITIAL->1.1
external/gcc/zlib/win32/zlib.def:INITIAL->1.1
external/gcc/zlib/win32/zlib1.rc:INITIAL->1.1
include/Makefile.in:1.265->1.266
kaffe/Makefile.in:1.163->1.164
kaffe/jvmpi/Makefile.in:1.87->1.88
kaffe/kaffe/Makefile.in:1.185->1.186
kaffe/kaffeh/Makefile.in:1.165->1.166
kaffe/kaffevm/Makefile.in:1.218->1.219
kaffe/kaffevm/boehm-gc/Makefile.in:1.50->1.51
kaffe/kaffevm/gcj/Makefile.in:1.143->1.144
kaffe/kaffevm/intrp/Makefile.in:1.152->1.153
kaffe/kaffevm/jit/Makefile.in:1.162->1.163
kaffe/kaffevm/jit3/Makefile.in:1.132->1.133
kaffe/kaffevm/jni/Makefile.in:1.56->1.57
kaffe/kaffevm/kaffe-gc/Makefile.in:1.49->1.50
kaffe/kaffevm/systems/Makefile.in:1.152->1.153
kaffe/kaffevm/systems/beos-native/Makefile.in:1.143->1.144
kaffe/kaffevm/systems/drops-l4threads/Makefile.in:1.6->1.7
kaffe/kaffevm/systems/oskit-pthreads/Makefile.in:1.149->1.150
kaffe/kaffevm/systems/unix-jthreads/Makefile.in:1.153->1.154
kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.128->1.129
kaffe/kaffevm/verifier/Makefile.in:1.55->1.56
kaffe/man/Makefile.in:1.150->1.151
kaffe/scripts/Makefile.in:1.190->1.191
kaffe/scripts/jar.in:1.6->1.7
kaffe/scripts/bat/Makefile.in:1.142->1.143
kaffe/scripts/compat/Makefile.in:1.169->1.170
kaffe/xprof/Makefile.in:1.118->1.119
libraries/Makefile.in:1.146->1.147
libraries/clib/Makefile.am:1.22->1.23
libraries/clib/Makefile.in:1.163->1.164
libraries/clib/awt/Makefile.in:1.161->1.162
libraries/clib/awt/X/Makefile.in:1.154->1.155
libraries/clib/awt/nano-X/Makefile.in:1.26->1.27
libraries/clib/awt/qt/Makefile.in:1.109->1.110
libraries/clib/io/Makefile.in:1.159->1.160
libraries/clib/management/Makefile.in:1.163->1.164
libraries/clib/math/Makefile.in:1.158->1.159
libraries/clib/native/Makefile.in:1.205->1.206
libraries/clib/net/Makefile.in:1.168->1.169
libraries/clib/nio/Makefile.in:1.93->1.94
libraries/clib/security/Makefile.in:1.129->1.130
libraries/clib/sound/Makefile.in:1.55->1.56
libraries/clib/sound/alsa/Makefile.in:1.56->1.57
libraries/clib/sound/common/Makefile.in:1.55->1.56
libraries/clib/sound/esd/Makefile.in:1.56->1.57
libraries/clib/target/Makefile.in:1.15->1.16
libraries/clib/target/Linux/Makefile.in:1.15->1.16
libraries/clib/target/generic/Makefile.in:1.15->1.16
libraries/clib/zip/Makefile.am:1.13->1.14
libraries/clib/zip/Makefile.in:1.160->1.161
libraries/clib/zlib/ChangeLog:1.1->1.2(DEAD)
libraries/clib/zlib/ChangeLog.gcj:1.1->1.2(DEAD)
libraries/clib/zlib/ChangeLog.kaffe:1.1->1.2(DEAD)
libraries/clib/zlib/FAQ:1.1->1.2(DEAD)
libraries/clib/zlib/INDEX:1.1->1.2(DEAD)
libraries/clib/zlib/Makefile.am:1.1->1.2(DEAD)
libraries/clib/zlib/Makefile.in:1.1->1.2(DEAD)
libraries/clib/zlib/README:1.1->1.2(DEAD)
libraries/clib/zlib/acinclude.m4:1.1->1.2(DEAD)
libraries/clib/zlib/aclocal.m4:1.1->1.2(DEAD)
libraries/clib/zlib/adler32.c:1.1->1.2(DEAD)
libraries/clib/zlib/algorithm.txt:1.1->1.2(DEAD)
libraries/clib/zlib/compress.c:1.1->1.2(DEAD)
libraries/clib/zlib/configure:1.1->1.2(DEAD)
libraries/clib/zlib/configure.ac:1.1->1.2(DEAD)
libraries/clib/zlib/crc32.c:1.1->1.2(DEAD)
libraries/clib/zlib/crc32.h:1.1->1.2(DEAD)
libraries/clib/zlib/deflate.c:1.1->1.2(DEAD)
libraries/clib/zlib/deflate.h:1.1->1.2(DEAD)
libraries/clib/zlib/example.c:1.1->1.2(DEAD)
libraries/clib/zlib/gzio.c:1.1->1.2(DEAD)
libraries/clib/zlib/infback.c:1.1->1.2(DEAD)
libraries/clib/zlib/inffast.c:1.1->1.2(DEAD)
libraries/clib/zlib/inffast.h:1.1->1.2(DEAD)
libraries/clib/zlib/inffixed.h:1.1->1.2(DEAD)
libraries/clib/zlib/inflate.c:1.1->1.2(DEAD)
libraries/clib/zlib/inflate.h:1.1->1.2(DEAD)
libraries/clib/zlib/inftrees.c:1.1->1.2(DEAD)
libraries/clib/zlib/inftrees.h:1.1->1.2(DEAD)
libraries/clib/zlib/make_vms.com:1.1->1.2(DEAD)
libraries/clib/zlib/minigzip.c:1.1->1.2(DEAD)
libraries/clib/zlib/trees.c:1.1->1.2(DEAD)
libraries/clib/zlib/trees.h:1.1->1.2(DEAD)
libraries/clib/zlib/uncompr.c:1.1->1.2(DEAD)
libraries/clib/zlib/zconf.h:1.1->1.2(DEAD)
libraries/clib/zlib/zconf.in.h:1.1->1.2(DEAD)
libraries/clib/zlib/zlib.3:1.1->1.2(DEAD)
libraries/clib/zlib/zlib.h:1.1->1.2(DEAD)
libraries/clib/zlib/zutil.c:1.1->1.2(DEAD)
libraries/clib/zlib/zutil.h:1.1->1.2(DEAD)
libraries/clib/zlib/amiga/Makefile.pup:1.1->1.2(DEAD)
libraries/clib/zlib/amiga/Makefile.sas:1.1->1.2(DEAD)
libraries/clib/zlib/as400/bndsrc:1.1->1.2(DEAD)
libraries/clib/zlib/as400/compile.clp:1.1->1.2(DEAD)
libraries/clib/zlib/as400/readme.txt:1.1->1.2(DEAD)
libraries/clib/zlib/as400/zlib.inc:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/README.contrib:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/ada/buffer_demo.adb:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/ada/mtest.adb:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/ada/read.adb:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/ada/readme.txt:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/ada/test.adb:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/ada/zlib-streams.adb:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/ada/zlib-streams.ads:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/ada/zlib-thin.adb:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/ada/zlib-thin.ads:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/ada/zlib.adb:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/ada/zlib.ads:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/ada/zlib.gpr:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/asm586/README.586:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/asm586/match.S:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/asm686/README.686:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/asm686/match.S:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/blast/Makefile:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/blast/README:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/blast/blast.c:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/blast/blast.h:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/blast/test.pk:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/blast/test.txt:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/delphi/ZLib.pas:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/delphi/ZLibConst.pas:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/delphi/readme.txt:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/delphi/zlibd32.mak:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/dotzlib/DotZLib.build:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/dotzlib/DotZLib.chm:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/dotzlib/DotZLib.sln:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/dotzlib/LICENSE_1_0.txt:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/dotzlib/readme.txt:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/dotzlib/DotZLib/AssemblyInfo.cs:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/dotzlib/DotZLib/ChecksumImpl.cs:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/dotzlib/DotZLib/CircularBuffer.cs:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/dotzlib/DotZLib/CodecBase.cs:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/dotzlib/DotZLib/Deflater.cs:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/dotzlib/DotZLib/DotZLib.cs:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/dotzlib/DotZLib/DotZLib.csproj:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/dotzlib/DotZLib/GZipStream.cs:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/dotzlib/DotZLib/Inflater.cs:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/dotzlib/DotZLib/UnitTests.cs:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/infback9/README:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/infback9/infback9.c:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/infback9/infback9.h:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/infback9/inffix9.h:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/infback9/inflate9.h:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/infback9/inftree9.c:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/infback9/inftree9.h:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/inflate86/inffas86.c:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/inflate86/inffast.S:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/iostream/test.cpp:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/iostream/zfstream.cpp:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/iostream/zfstream.h:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/iostream2/zstream.h:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/iostream2/zstream_test.cpp:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/iostream3/README:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/iostream3/TODO:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/iostream3/test.cc:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/iostream3/zfstream.cc:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/iostream3/zfstream.h:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/masm686/match.asm:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/masmx64/bld_ml64.bat:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/masmx64/gvmat64.asm:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/masmx64/gvmat64.obj:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/masmx64/inffas8664.c:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/masmx64/inffasx64.asm:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/masmx64/inffasx64.obj:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/masmx64/readme.txt:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/masmx86/bld_ml32.bat:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/masmx86/gvmat32.asm:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/masmx86/gvmat32.obj:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/masmx86/gvmat32c.c:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/masmx86/inffas32.asm:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/masmx86/inffas32.obj:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/masmx86/mkasm.bat:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/masmx86/readme.txt:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/minizip/ChangeLogUnzip:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/minizip/Makefile:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/minizip/crypt.h:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/minizip/ioapi.c:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/minizip/ioapi.h:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/minizip/iowin32.c:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/minizip/iowin32.h:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/minizip/miniunz.c:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/minizip/minizip.c:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/minizip/mztools.c:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/minizip/mztools.h:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/minizip/unzip.c:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/minizip/unzip.h:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/minizip/zip.c:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/minizip/zip.h:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/pascal/example.pas:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/pascal/readme.txt:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/pascal/zlibd32.mak:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/pascal/zlibpas.pas:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/puff/Makefile:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/puff/README:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/puff/puff.c:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/puff/puff.h:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/puff/zeros.raw:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/testzlib/testzlib.c:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/testzlib/testzlib.txt:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/untgz/Makefile:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/untgz/Makefile.msc:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/untgz/untgz.c:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/vstudio/readme.txt:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/vstudio/vc7/miniunz.vcproj:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/vstudio/vc7/minizip.vcproj:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/vstudio/vc7/testzlib.vcproj:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/vstudio/vc7/zlib.rc:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/vstudio/vc7/zlibstat.vcproj:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/vstudio/vc7/zlibvc.def:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/vstudio/vc7/zlibvc.sln:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/vstudio/vc7/zlibvc.vcproj:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/vstudio/vc8/miniunz.vcproj:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/vstudio/vc8/minizip.vcproj:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/vstudio/vc8/testzlib.vcproj:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/vstudio/vc8/testzlibdll.vcproj:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/vstudio/vc8/zlib.rc:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/vstudio/vc8/zlibstat.vcproj:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/vstudio/vc8/zlibvc.def:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/vstudio/vc8/zlibvc.sln:1.1->1.2(DEAD)
libraries/clib/zlib/contrib/vstudio/vc8/zlibvc.vcproj:1.1->1.2(DEAD)
libraries/clib/zlib/examples/README.examples:1.1->1.2(DEAD)
libraries/clib/zlib/examples/fitblk.c:1.1->1.2(DEAD)
libraries/clib/zlib/examples/gun.c:1.1->1.2(DEAD)
libraries/clib/zlib/examples/gzappend.c:1.1->1.2(DEAD)
libraries/clib/zlib/examples/gzjoin.c:1.1->1.2(DEAD)
libraries/clib/zlib/examples/gzlog.c:1.1->1.2(DEAD)
libraries/clib/zlib/examples/gzlog.h:1.1->1.2(DEAD)
libraries/clib/zlib/examples/zlib_how.html:1.1->1.2(DEAD)
libraries/clib/zlib/examples/zpipe.c:1.1->1.2(DEAD)
libraries/clib/zlib/examples/zran.c:1.1->1.2(DEAD)
libraries/clib/zlib/msdos/Makefile.bor:1.1->1.2(DEAD)
libraries/clib/zlib/msdos/Makefile.dj2:1.1->1.2(DEAD)
libraries/clib/zlib/msdos/Makefile.emx:1.1->1.2(DEAD)
libraries/clib/zlib/msdos/Makefile.msc:1.1->1.2(DEAD)
libraries/clib/zlib/msdos/Makefile.tc:1.1->1.2(DEAD)
libraries/clib/zlib/old/Makefile.riscos:1.1->1.2(DEAD)
libraries/clib/zlib/old/README:1.1->1.2(DEAD)
libraries/clib/zlib/old/descrip.mms:1.1->1.2(DEAD)
libraries/clib/zlib/old/visual-basic.txt:1.1->1.2(DEAD)
libraries/clib/zlib/old/zlib.html:1.1->1.2(DEAD)
libraries/clib/zlib/old/os2/Makefile.os2:1.1->1.2(DEAD)
libraries/clib/zlib/old/os2/zlib.def:1.1->1.2(DEAD)
libraries/clib/zlib/projects/README.projects:1.1->1.2(DEAD)
libraries/clib/zlib/projects/visualc6/README.txt:1.1->1.2(DEAD)
libraries/clib/zlib/projects/visualc6/example.dsp:1.1->1.2(DEAD)
libraries/clib/zlib/projects/visualc6/minigzip.dsp:1.1->1.2(DEAD)
libraries/clib/zlib/projects/visualc6/zlib.dsp:1.1->1.2(DEAD)
libraries/clib/zlib/projects/visualc6/zlib.dsw:1.1->1.2(DEAD)
libraries/clib/zlib/qnx/package.qpg:1.1->1.2(DEAD)
libraries/clib/zlib/win32/DLL_FAQ.txt:1.1->1.2(DEAD)
libraries/clib/zlib/win32/Makefile.bor:1.1->1.2(DEAD)
libraries/clib/zlib/win32/Makefile.emx:1.1->1.2(DEAD)
libraries/clib/zlib/win32/Makefile.gcc:1.1->1.2(DEAD)
libraries/clib/zlib/win32/Makefile.msc:1.1->1.2(DEAD)
libraries/clib/zlib/win32/VisualC.txt:1.1->1.2(DEAD)
libraries/clib/zlib/win32/zlib.def:1.1->1.2(DEAD)
libraries/clib/zlib/win32/zlib1.rc:1.1->1.2(DEAD)
libraries/extensions/Makefile.in:1.138->1.139
libraries/extensions/comm/Makefile.in:1.132->1.133
libraries/extensions/comm/javalib/Makefile.in:1.133->1.134
libraries/extensions/microsoft/Makefile.in:1.124->1.125
libraries/extensions/microsoft/clib/Makefile.in:1.128->1.129
libraries/extensions/microsoft/javalib/Makefile.in:1.126->1.127
libraries/extensions/pjava/Makefile.in:1.132->1.133
libraries/extensions/pjava/javalib/Makefile.in:1.133->1.134
libraries/extensions/servlet/Makefile.in:1.132->1.133
libraries/extensions/servlet/javalib/Makefile.in:1.133->1.134
libraries/javalib/Makefile.am:1.418->1.419
libraries/javalib/Makefile.in:1.517->1.518
libraries/javalib/awt-implementations/Makefile.in:1.40->1.41
libraries/javalib/awt-implementations/kaffe/Makefile.in:1.44->1.45
libraries/javalib/gmp-math/Makefile.in:1.47->1.48
libraries/javalib/vmspecific/org/kaffe/tools/jar/Jar.java:1.1->1.2(DEAD)
libraries/javalib/vmspecific/org/kaffe/tools/jar/XPFile.java:1.1->1.2(DEAD)
libraries/javalib/vmspecific/org/kaffe/tools/jar/XPFileInputStream.java:1.1->1.2(DEAD)
libraries/javalib/vmspecific/org/kaffe/tools/jar/XPFileOutputStream.java:1.1->1.2(DEAD)
libraries/javalib/vmspecific/org/kaffe/tools/jar/XPFileReader.java:1.1->1.2(DEAD)
libraries/javalib/vmspecific/org/kaffe/tools/jar/XPFileWriter.java:1.1->1.2(DEAD)
replace/Makefile.in:1.105->1.106
test/Makefile.in:1.155->1.156
test/internal/Makefile.in:1.124->1.125
test/jni/Makefile.in:1.58->1.59
test/regression/Makefile.in:1.230->1.231
test/regression/compile_time/Makefile.in:1.83->1.84
test/regression/compiler/Makefile.in:1.67->1.68
test/regression/run_time/Makefile.in:1.82->1.83
tools/Makefile.in:1.57->1.58
tools/gjdoc/Makefile.in:1.56->1.57
tools/gjdoc/javalib/Makefile.in:1.72->1.73
tools/javatools/Makefile.in:1.10->1.11
tools/javatools/javalib/Makefile.in:1.11->1.12
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4590 kaffe/ChangeLog:1.4591
--- kaffe/ChangeLog:1.4590 Mon Jan 2 09:24:40 2006
+++ kaffe/ChangeLog Tue Jan 3 15:26:37 2006
@@ -1,3 +1,40 @@
+2006-01-03 Dalibor Topic <robilad at kaffe.org>
+
+ * Makefile.am: (SUBDIRS) Added external subdir.
+ (DIST_SUBDIRS) Added external subdir.
+
+ * THIRDPARTY: Added information on fastjar. Adapted information on
+ zlib.
+
+ * configure.ac: (--with-internal-zlib) Replaced by
+ (--with-system-zlib), so that kaffe now uses the merged in
+ zlib by default, like gcc does.
+ (--disable-fastjar) New option.
+ Added fastjar subdir for configuration, and the Makefile for output.
+
+ * kaffe/scripts/jar.in: Delegate to fastjar
+
+ * libraries/clib/Makefile.am (SUBDIRS): Removed zlib.
+
+ * libraries/clib/zip/Makefile.am (COND_INTERNAL_ZLIB) Replaced by
+ (COND_SYSTEM_ZLIB). Adapted to use internal zlib from external/gcc
+ directory.
+
+ * libraries/javalib/Makefile.am: Regenerated.
+
+ * libraries/javalib/vmspecific/org/kaffe/tools/jar/Jar.java
+ libraries/javalib/vmspecific/org/kaffe/tools/jar/XPFile.java
+ libraries/javalib/vmspecific/org/kaffe/tools/jar/XPFileInputStream.java
+ libraries/javalib/vmspecific/org/kaffe/tools/jar/XPFileOutputStream.java
+ libraries/javalib/vmspecific/org/kaffe/tools/jar/XPFileReader.java
+ libraries/javalib/vmspecific/org/kaffe/tools/jar/XPFileWriter.java:
+ Removed.
+
+ * libraries/clib/zlib : Moved over to external/gcc/zlib.
+
+ * external/gcc/fastjar: New files. Merged in from gcc 4.0.2.
+ Slightly adapted the build system to behave well when merged into Kaffe.
+
2006-01-02 Guilhem Lavaux <guilhem at kaffe.org>
* libraries/clib/fdlibm: Removed.
Index: kaffe/Makefile.am
diff -u kaffe/Makefile.am:1.105 kaffe/Makefile.am:1.106
--- kaffe/Makefile.am:1.105 Sat Dec 3 16:53:12 2005
+++ kaffe/Makefile.am Tue Jan 3 15:26:42 2006
@@ -16,6 +16,7 @@
SUBDIRS = \
. \
+ external \
libraries/javalib \
config \
libltdl \
@@ -28,7 +29,17 @@
po \
tools
-DIST_SUBDIRS = config include replace libltdl kaffe libraries tools test po
+DIST_SUBDIRS = \
+ config \
+ external \
+ include \
+ replace \
+ libltdl \
+ kaffe \
+ libraries \
+ tools \
+ test \
+ po
EXTRA_DIST = \
ChangeLog.1 \
Index: kaffe/Makefile.in
diff -u kaffe/Makefile.in:1.238 kaffe/Makefile.in:1.239
--- kaffe/Makefile.in:1.238 Wed Dec 28 20:43:51 2005
+++ kaffe/Makefile.in Tue Jan 3 15:26:43 2006
@@ -137,10 +137,10 @@
COND_CLASSPATH_TOOLS_TRUE = @COND_CLASSPATH_TOOLS_TRUE@
COND_DIRECT_THREADING_FALSE = @COND_DIRECT_THREADING_FALSE@
COND_DIRECT_THREADING_TRUE = @COND_DIRECT_THREADING_TRUE@
+COND_FASTJAR_FALSE = @COND_FASTJAR_FALSE@
+COND_FASTJAR_TRUE = @COND_FASTJAR_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@
@@ -157,6 +157,8 @@
COND_SOUND_ALSA_TRUE = @COND_SOUND_ALSA_TRUE@
COND_SOUND_ESD_FALSE = @COND_SOUND_ESD_FALSE@
COND_SOUND_ESD_TRUE = @COND_SOUND_ESD_TRUE@
+COND_SYSTEM_ZLIB_FALSE = @COND_SYSTEM_ZLIB_FALSE@
+COND_SYSTEM_ZLIB_TRUE = @COND_SYSTEM_ZLIB_TRUE@
CONFIG_CALLKAFFEEXCEPTION_H = @CONFIG_CALLKAFFEEXCEPTION_H@
CONFIG_JIT_MD_H = @CONFIG_JIT_MD_H@
CONFIG_MD_H = @CONFIG_MD_H@
@@ -373,6 +375,7 @@
AUTOMAKE_OPTIONS = foreign 1.3e
SUBDIRS = \
. \
+ external \
libraries/javalib \
config \
libltdl \
@@ -385,7 +388,18 @@
po \
tools
-DIST_SUBDIRS = config include replace libltdl kaffe libraries tools test po
+DIST_SUBDIRS = \
+ config \
+ external \
+ include \
+ replace \
+ libltdl \
+ kaffe \
+ libraries \
+ tools \
+ test \
+ po
+
EXTRA_DIST = \
ChangeLog.1 \
ChangeLog.2 \
Index: kaffe/THIRDPARTY
diff -u kaffe/THIRDPARTY:1.41 kaffe/THIRDPARTY:1.42
--- kaffe/THIRDPARTY:1.41 Wed Dec 28 20:43:51 2005
+++ kaffe/THIRDPARTY Tue Jan 3 15:26:43 2006
@@ -3,7 +3,7 @@
licenses of third party sources either in their respective sources, or
in license*.terms files in the top directory, or here.
-* libraries/clib/zlib
+* external/gcc/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.
@@ -41,6 +41,19 @@
*/
More information on zlib is available from http://www.zlib.net.
+
+* external/gcc/fastjar
+
+This code has been merged in from gcc. Kaffe tracks this projects's
+SVN HEAD.
+
+fastjar is distributed under the GNU General Public License Version 2.
+
+See license.terms for the text of the GNU General Public License
+Version 2.
+
+More information on fastjar can be found at
+http://gcc.gnu.org/.
* javax.sound
Index: kaffe/configure
diff -u kaffe/configure:1.522 kaffe/configure:1.523
--- kaffe/configure:1.522 Mon Jan 2 09:24:44 2006
+++ kaffe/configure Tue Jan 3 15:26:43 2006
@@ -491,8 +491,9 @@
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 external/gcc/fastjar"
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 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_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_SYSTEM_ZLIB_TRUE COND_SYSTEM_ZLIB_FALSE COND_FASTJAR_TRUE COND_FASTJAR_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.
@@ -1111,6 +1112,7 @@
enable to use JNI native methods default=yes
--disable-direct-threading
Use switched interpreter instead of direct-threading
+ --disable-fastjar Don't build fastjar tool
--enable-binreloc compile with binary relocation support
(default=enable when available)
--enable-binreloc-threads compile binary relocation with threads support
@@ -1183,8 +1185,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-system-zlib Use installed zlib on the system instead of Kaffe's
+ copy
--with-jni-library-path=dir
additional directories to search for native jni
libraries
@@ -5983,7 +5985,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 5986 "configure"' > conftest.$ac_ext
+ echo '#line 5988 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -7360,7 +7362,7 @@
# Provide some information about the compiler.
-echo "$as_me:7363:" \
+echo "$as_me:7365:" \
"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
@@ -8427,11 +8429,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:8430: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8432: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8434: \$? = $ac_status" >&5
+ echo "$as_me:8436: \$? = $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.
@@ -8695,11 +8697,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:8698: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8700: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8702: \$? = $ac_status" >&5
+ echo "$as_me:8704: \$? = $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.
@@ -8799,11 +8801,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:8802: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8804: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:8806: \$? = $ac_status" >&5
+ echo "$as_me:8808: \$? = $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
@@ -11144,7 +11146,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 11147 "configure"
+#line 11149 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11244,7 +11246,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 11247 "configure"
+#line 11249 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13588,11 +13590,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:13591: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13593: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13595: \$? = $ac_status" >&5
+ echo "$as_me:13597: \$? = $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.
@@ -13692,11 +13694,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:13695: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13697: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13699: \$? = $ac_status" >&5
+ echo "$as_me:13701: \$? = $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
@@ -15262,11 +15264,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:15265: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15267: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15269: \$? = $ac_status" >&5
+ echo "$as_me:15271: \$? = $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.
@@ -15366,11 +15368,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:15369: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15371: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:15373: \$? = $ac_status" >&5
+ echo "$as_me:15375: \$? = $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
@@ -17573,11 +17575,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:17576: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17578: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:17580: \$? = $ac_status" >&5
+ echo "$as_me:17582: \$? = $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.
@@ -17841,11 +17843,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:17844: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17846: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:17848: \$? = $ac_status" >&5
+ echo "$as_me:17850: \$? = $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.
@@ -17945,11 +17947,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:17948: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17950: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:17952: \$? = $ac_status" >&5
+ echo "$as_me:17954: \$? = $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
@@ -48825,23 +48827,43 @@
-# Check whether --with-internal-zlib or --without-internal-zlib was given.
-if test "${with_internal_zlib+set}" = set; then
- withval="$with_internal_zlib"
+# Check whether --with-system-zlib or --without-system-zlib was given.
+if test "${with_system_zlib+set}" = set; then
+ withval="$with_system_zlib"
else
- with_internal_zlib=no
+ with_system_zlib=no
fi;
-if test x"$with_internal_zlib" != x"no"; then
- COND_INTERNAL_ZLIB_TRUE=
- COND_INTERNAL_ZLIB_FALSE='#'
+if test x"$with_system_zlib" != x"no"; then
+ COND_SYSTEM_ZLIB_TRUE=
+ COND_SYSTEM_ZLIB_FALSE='#'
else
- COND_INTERNAL_ZLIB_TRUE='#'
- COND_INTERNAL_ZLIB_FALSE=
+ COND_SYSTEM_ZLIB_TRUE='#'
*** Patch too long, truncated ***
More information about the kaffe
mailing list