[kaffe] CVS kaffe (robilad): removed checks for zlib
Kaffe CVS
cvs-commits at kaffe.org
Sat Feb 2 07:28:58 PST 2008
PatchSet 7727
Date: 2008/02/02 15:26:40
Author: robilad
Branch: HEAD
Tag: (none)
Log:
removed checks for zlib
2008-02-02 Dalibor Topic <robilad at kaffe.org>
* configure.ac: Removed checks for zlib.h, libz, and ZIP_LIBS.
* libraries/clib/zip/Makefile.am (libzip_la_CFLAGS): Added
ZZIP_CFLAGS. (libzip_la_LIBADD): Replaced ZIP_LIBS by ZZIP_LIBS.
Members:
ChangeLog:1.5228->1.5229
Makefile.in:1.311->1.312
configure:1.637->1.638
configure.ac:1.307->1.308
config/Makefile.in:1.255->1.256
config/config.h.in:1.181->1.182
include/Makefile.in:1.319->1.320
kaffe/Makefile.in:1.204->1.205
kaffe/jvmpi/Makefile.in:1.130->1.131
kaffe/kaffe/Makefile.in:1.229->1.230
kaffe/kaffeh/Makefile.in:1.211->1.212
kaffe/kaffevm/Makefile.in:1.285->1.286
kaffe/kaffevm/boehm-gc/Makefile.in:1.95->1.96
kaffe/kaffevm/gcj/Makefile.in:1.184->1.185
kaffe/kaffevm/intrp/Makefile.in:1.193->1.194
kaffe/kaffevm/jit/Makefile.in:1.203->1.204
kaffe/kaffevm/jit3/Makefile.in:1.173->1.174
kaffe/kaffevm/kaffe-gc/Makefile.in:1.93->1.94
kaffe/kaffevm/systems/Makefile.in:1.193->1.194
kaffe/kaffevm/systems/beos-native/Makefile.in:1.184->1.185
kaffe/kaffevm/systems/drops-l4threads/Makefile.in:1.48->1.49
kaffe/kaffevm/systems/oskit-pthreads/Makefile.in:1.190->1.191
kaffe/kaffevm/systems/unix-jthreads/Makefile.in:1.194->1.195
kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.170->1.171
kaffe/man/Makefile.in:1.191->1.192
kaffe/scripts/Makefile.in:1.237->1.238
kaffe/scripts/bat/Makefile.in:1.184->1.185
kaffe/scripts/compat/Makefile.in:1.212->1.213
kaffe/xprof/Makefile.in:1.160->1.161
libraries/Makefile.in:1.187->1.188
libraries/clib/Makefile.in:1.209->1.210
libraries/clib/awt/Makefile.in:1.202->1.203
libraries/clib/awt/X/Makefile.in:1.198->1.199
libraries/clib/awt/nano-X/Makefile.in:1.69->1.70
libraries/clib/awt/qt/Makefile.in:1.150->1.151
libraries/clib/awt/xynth/Makefile.in:1.25->1.26
libraries/clib/math/Makefile.in:1.200->1.201
libraries/clib/zip/Makefile.am:1.22->1.23
libraries/clib/zip/Makefile.in:1.207->1.208
libraries/javalib/Makefile.in:1.600->1.601
libraries/javalib/awt-implementations/Makefile.in:1.81->1.82
libraries/javalib/awt-implementations/kaffe/Makefile.in:1.104->1.105
libraries/javalib/gmp-math/Makefile.in:1.90->1.91
libraries/javalib/vmspecific/Makefile.in:1.33->1.34
libraries/javalib/zlib-zip/Makefile.in:1.31->1.32
replace/Makefile.in:1.147->1.148
test/Makefile.in:1.196->1.197
test/internal/Makefile.in:1.172->1.173
test/jni/Makefile.in:1.104->1.105
test/regression/Makefile.in:1.275->1.276
test/regression/compile_time/Makefile.in:1.124->1.125
test/regression/compiler/Makefile.in:1.108->1.109
test/regression/run_time/Makefile.in:1.123->1.124
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5228 kaffe/ChangeLog:1.5229
--- kaffe/ChangeLog:1.5228 Sat Feb 2 15:10:25 2008
+++ kaffe/ChangeLog Sat Feb 2 15:26:40 2008
@@ -1,5 +1,12 @@
2008-02-02 Dalibor Topic <robilad at kaffe.org>
+ * configure.ac: Removed checks for zlib.h, libz, and ZIP_LIBS.
+
+ * libraries/clib/zip/Makefile.am (libzip_la_CFLAGS): Added
+ ZZIP_CFLAGS. (libzip_la_LIBADD): Replaced ZIP_LIBS by ZZIP_LIBS.
+
+2008-02-02 Dalibor Topic <robilad at kaffe.org>
+
* libraries/javalib/zlib-zip/org/kaffe/util/Assert.java,
libraries/javalib/zlib-zip/org/kaffe/util/UTF8.java,
Index: kaffe/Makefile.in
diff -u kaffe/Makefile.in:1.311 kaffe/Makefile.in:1.312
--- kaffe/Makefile.in:1.311 Tue Jan 22 23:21:21 2008
+++ kaffe/Makefile.in Sat Feb 2 15:26:40 2008
@@ -240,7 +240,6 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
-ZIP_LIBS = @ZIP_LIBS@
ZZIP_CFLAGS = @ZZIP_CFLAGS@
ZZIP_LIBS = @ZZIP_LIBS@
abs_builddir = @abs_builddir@
Index: kaffe/configure
diff -u kaffe/configure:1.637 kaffe/configure:1.638
--- kaffe/configure:1.637 Tue Jan 22 23:21:21 2008
+++ kaffe/configure Sat Feb 2 15:26:40 2008
@@ -972,7 +972,6 @@
HAVE_JASMIN_FALSE
KAFFE_LIBS
M_LIBS
-ZIP_LIBS
LIBADD_GMP
USE_GMP
GC_NAME
@@ -2185,7 +2184,6 @@
ac_header_list="$ac_header_list sys/ucontext.h"
ac_header_list="$ac_header_list unistd.h"
ac_header_list="$ac_header_list wintypes.h"
-ac_header_list="$ac_header_list zlib.h"
ac_header_list="$ac_header_list asm/sigcontext.h"
ac_header_list="$ac_header_list asm/ppc_asm.h"
ac_header_list="$ac_header_list asm/cachectl.h"
@@ -7041,7 +7039,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 7044 "configure"' > conftest.$ac_ext
+ echo '#line 7042 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -9601,11 +9599,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:9604: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:9602: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9608: \$? = $ac_status" >&5
+ echo "$as_me:9606: \$? = $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.
@@ -9891,11 +9889,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:9894: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:9892: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9898: \$? = $ac_status" >&5
+ echo "$as_me:9896: \$? = $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.
@@ -9995,11 +9993,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:9998: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:9996: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:10002: \$? = $ac_status" >&5
+ echo "$as_me:10000: \$? = $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
@@ -12357,7 +12355,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 12360 "configure"
+#line 12358 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -12457,7 +12455,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 12460 "configure"
+#line 12458 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -14877,11 +14875,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:14880: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14878: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14884: \$? = $ac_status" >&5
+ echo "$as_me:14882: \$? = $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.
@@ -14981,11 +14979,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:14984: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14982: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14988: \$? = $ac_status" >&5
+ echo "$as_me:14986: \$? = $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
@@ -16558,11 +16556,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:16561: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16559: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16565: \$? = $ac_status" >&5
+ echo "$as_me:16563: \$? = $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.
@@ -16662,11 +16660,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:16665: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16663: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16669: \$? = $ac_status" >&5
+ echo "$as_me:16667: \$? = $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
@@ -18862,11 +18860,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:18865: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:18863: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:18869: \$? = $ac_status" >&5
+ echo "$as_me:18867: \$? = $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.
@@ -19152,11 +19150,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:19155: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:19153: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:19159: \$? = $ac_status" >&5
+ echo "$as_me:19157: \$? = $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.
@@ -19256,11 +19254,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:19259: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:19257: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:19263: \$? = $ac_status" >&5
+ echo "$as_me:19261: \$? = $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
@@ -25811,7 +25809,7 @@
JAVA_TEST=Test.java
CLASS_TEST=Test.class
cat << \EOF > $JAVA_TEST
-/* #line 25814 "configure" */
+/* #line 25812 "configure" */
public class Test {
}
EOF
@@ -29594,85 +29592,6 @@
;;
esac
-KSAVE_LIBS="$LIBS"
-LIBS="$ZIP_LIBS $KSAVE_LIBS"
-
-{ echo "$as_me:$LINENO: checking for deflate in -lz" >&5
-echo $ECHO_N "checking for deflate in -lz... $ECHO_C" >&6; }
-if test "${ac_cv_lib_z_deflate+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_check_lib_save_LIBS=$LIBS
-LIBS="-lz $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-/* Override any GCC internal prototype to avoid an error.
- Use char because int might match the return type of a GCC
- builtin and then its argument prototype would still apply. */
-#ifdef __cplusplus
-extern "C"
-#endif
-char deflate ();
-int
-main ()
-{
-return deflate ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- ac_cv_lib_z_deflate=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
- ac_cv_lib_z_deflate=no
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_lib_z_deflate" >&5
-echo "${ECHO_T}$ac_cv_lib_z_deflate" >&6; }
-if test $ac_cv_lib_z_deflate = yes; then
- cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBZ 1
-_ACEOF
-
- LIBS="-lz $LIBS"
-
-fi
-
-ZIP_LIBS=`echo "$LIBS" | sed "s% $KSAVE_LIBS$%%"`
-LIBS="$KSAVE_LIBS"
-
-ZIP_LIBS="$CTLIBS $ZIP_LIBS"
-
-
for ac_header in gmp.h
do
@@ -30335,10 +30254,6 @@
-
-
-
-
# check sys/sysctl.h seperately, as it requires other headers on at least OpenBSD
for ac_header in sys/sysctl.h
@@ -40015,7 +39930,7 @@
LIBS="$KSAVE_LIBS"
OLIBS=$LIBS
- LIBS="$ZIP_LIBS $M_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $OLIBS"
+ LIBS="$M_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $OLIBS"
KSAVE_LIBS="$LIBS"
LIBS="$X_PRE_LIBS $KSAVE_LIBS"
@@ -40444,7 +40359,7 @@
done
CPPFLAGS=$OCPPFLAGS
- LIBS="$ZIP_LIBS $M_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $OLIBS"
+ LIBS="$M_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $OLIBS"
KSAVE_LIBS="$LIBS"
LIBS="$JPEG_LIBS $KSAVE_LIBS"
@@ -40814,8 +40729,8 @@
fi
LIBS=$OLIBS
- if test -n "$PNG_LIBS" && test -n "$ZIP_LIBS"; then
- PNG_LIBS="$PNG_LIBS $ZIP_LIBS $M_LIBS"
+ if test -n "$PNG_LIBS"; then
+ PNG_LIBS="$PNG_LIBS $M_LIBS"
else
PNG_LIBS=""
fi
@@ -41760,7 +41675,7 @@
fi
fi
-# Make sure that we get a zlib instance with zzip_fstat.
+# Make sure that we get a zziplib instance with zzip_fstat.
if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
@@ -42141,43 +42056,6 @@
-if test x"$ac_cv_header_zlib_h" != x"yes" ; then
- { { echo "$as_me:$LINENO: error: Can't find or can't use system zlib.h" >&5
-echo "$as_me: error: Can't find or can't use system zlib.h" >&2;}
- { (exit 1); exit 1; }; }
-fi
-if test x"$ac_cv_lib_z_deflate" != x"yes" ; then
- { { echo "$as_me:$LINENO: error: Can't find system zlib or can't find function deflate in it" >&5
-echo "$as_me: error: Can't find system zlib or can't find function deflate in it" >&2;}
- { (exit 1); exit 1; }; }
-fi
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-#include <zlib.h>
-
-#if ZLIB_VERNUM >= 0x1230
- yes
-#endif
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
- $EGREP "yes" >/dev/null 2>&1; then
- is_recent_zlib=yes
-else
- is_recent_zlib=no
-fi
-rm -f conftest*
-
-if test x"$is_recent_zlib" != x"yes" ; then
- { { echo "$as_me:$LINENO: error: Can't find zlib 1.2.3 or later" >&5
-echo "$as_me: error: Can't find zlib 1.2.3 or later" >&2;}
- { (exit 1); exit 1; }; }
-fi
-
if test x"$cross_compiling" = x"yes"; then
if test x"${ac_cv_c_bigendian+set}" != x"set"; then
@@ -43923,8 +43801,8 @@
HAVE_JASMIN_FALSE!$HAVE_JASMIN_FALSE$ac_delim
KAFFE_LIBS!$KAFFE_LIBS$ac_delim
M_LIBS!$M_LIBS$ac_delim
-ZIP_LIBS!$ZIP_LIBS$ac_delim
LIBADD_GMP!$LIBADD_GMP$ac_delim
+USE_GMP!$USE_GMP$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -43966,7 +43844,6 @@
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
-USE_GMP!$USE_GMP$ac_delim
GC_NAME!$GC_NAME$ac_delim
HAVE_GCJ_SUPPORT_TRUE!$HAVE_GCJ_SUPPORT_TRUE$ac_delim
HAVE_GCJ_SUPPORT_FALSE!$HAVE_GCJ_SUPPORT_FALSE$ac_delim
@@ -44031,7 +43908,7 @@
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 63; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 62; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
Index: kaffe/configure.ac
diff -u kaffe/configure.ac:1.307 kaffe/configure.ac:1.308
--- kaffe/configure.ac:1.307 Tue Jan 22 23:21:22 2008
+++ kaffe/configure.ac Sat Feb 2 15:26:40 2008
@@ -896,11 +896,6 @@
AC_CHECK_LIBRARY(gcc,__moddi3,VM_LIBS);;
esac
-dnl Check for libraries for zip library.
-AC_CHECK_LIBRARY(z,deflate,ZIP_LIBS)
-ZIP_LIBS="$CTLIBS $ZIP_LIBS"
-AC_SUBST(ZIP_LIBS)
-
m4_LIB_GMP
dnl -------------------------------------------------------------------------
@@ -952,8 +947,7 @@
sys/utsname.h \
sys/ucontext.h \
unistd.h \
-wintypes.h \
-zlib.h])
+wintypes.h])
# check sys/sysctl.h seperately, as it requires other headers on at least OpenBSD
AC_CHECK_HEADERS([sys/sysctl.h], [], [],
@@ -1373,7 +1367,7 @@
dnl Instead of adding it to both JPEG_LIBS and PNG_LIBS, use X_LIBS
AC_CHECK_LIBRARY(Csup,__T_9__nothrow,X_LIBS)
OLIBS=$LIBS
- LIBS="$ZIP_LIBS $M_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $OLIBS"
+ LIBS="$M_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $OLIBS"
AC_CHECK_LIBRARY(Xext,XShmQueryExtension,X_PRE_LIBS)
OCPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $X_CFLAGS"
@@ -1383,7 +1377,7 @@
[[#include <X11/Xlib.h>
]])
CPPFLAGS=$OCPPFLAGS
- LIBS="$ZIP_LIBS $M_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $OLIBS"
+ LIBS="$M_LIBS $X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $OLIBS"
AC_CHECK_LIBRARY(jpeg,jpeg_read_header,JPEG_LIBS)
AC_CHECK_LIBRARY(png,png_create_info_struct,PNG_LIBS)
AC_CACHE_CHECK([for a usable version of gif_lib.h],
@@ -1405,8 +1399,8 @@
LIBS=$OLIBS
dnl If libpng is included, we also need libz - if we don't have it then
dnl we can't include png support.
- if test -n "$PNG_LIBS" && test -n "$ZIP_LIBS"; then
- PNG_LIBS="$PNG_LIBS $ZIP_LIBS $M_LIBS"
+ if test -n "$PNG_LIBS"; then
+ PNG_LIBS="$PNG_LIBS $M_LIBS"
else
PNG_LIBS=""
fi
@@ -1576,7 +1570,7 @@
fi
fi
-# Make sure that we get a zlib instance with zzip_fstat.
+# Make sure that we get a zziplib instance with zzip_fstat.
PKG_CHECK_MODULES([ZZIP],[zziplib >= 0.13.24])
AC_ARG_ENABLE([zlib_zip],
@@ -1668,26 +1662,6 @@
AM_CONDITIONAL([COND_DIRECT_THREADING], [test x"$enable_direct_threading" = x"yes"])
-
-dnl ------------------------------------------------------------
-dnl Ensure system installation of zlib can be used for the build
-dnl ------------------------------------------------------------
-if test x"$ac_cv_header_zlib_h" != x"yes" ; then
- AC_MSG_ERROR([Can't find or can't use system zlib.h])
-fi
-if test x"$ac_cv_lib_z_deflate" != x"yes" ; then
- AC_MSG_ERROR([Can't find system zlib or can't find function deflate in it])
-fi
-AC_EGREP_CPP(yes,
-[#include <zlib.h>
-
-#if ZLIB_VERNUM >= 0x1230
- yes
-#endif
-], is_recent_zlib=yes, is_recent_zlib=no)
-if test x"$is_recent_zlib" != x"yes" ; then
- AC_MSG_ERROR([Can't find zlib 1.2.3 or later])
-fi
dnl =========================================================================
dnl Set up for local build of kaffeh when cross-compiling
Index: kaffe/config/Makefile.in
diff -u kaffe/config/Makefile.in:1.255 kaffe/config/Makefile.in:1.256
--- kaffe/config/Makefile.in:1.255 Tue Jan 22 23:21:24 2008
+++ kaffe/config/Makefile.in Sat Feb 2 15:26:43 2008
@@ -214,7 +214,6 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
-ZIP_LIBS = @ZIP_LIBS@
ZZIP_CFLAGS = @ZZIP_CFLAGS@
ZZIP_LIBS = @ZZIP_LIBS@
abs_builddir = @abs_builddir@
Index: kaffe/config/config.h.in
diff -u kaffe/config/config.h.in:1.181 kaffe/config/config.h.in:1.182
--- kaffe/config/config.h.in:1.181 Tue Jan 22 23:21:24 2008
+++ kaffe/config/config.h.in Sat Feb 2 15:26:43 2008
@@ -206,9 +206,6 @@
/* Define to 1 if you have the `Xext' library (-lXext). */
#undef HAVE_LIBXEXT
-/* Define to 1 if you have the `z' library (-lz). */
-#undef HAVE_LIBZ
-
/* Define to 1 if you have the <limits.h> header file. */
#undef HAVE_LIMITS_H
@@ -465,9 +462,6 @@
/* Enable XScale support */
#undef HAVE_XSCALE
-
-/* Define to 1 if you have the <zlib.h> header file. */
-#undef HAVE_ZLIB_H
/* Define if __va_copy is available */
#undef HAVE__VA_COPY
Index: kaffe/include/Makefile.in
diff -u kaffe/include/Makefile.in:1.319 kaffe/include/Makefile.in:1.320
--- kaffe/include/Makefile.in:1.319 Tue Jan 22 23:21:25 2008
+++ kaffe/include/Makefile.in Sat Feb 2 15:26:44 2008
@@ -229,7 +229,6 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
-ZIP_LIBS = @ZIP_LIBS@
ZZIP_CFLAGS = @ZZIP_CFLAGS@
ZZIP_LIBS = @ZZIP_LIBS@
abs_builddir = @abs_builddir@
Index: kaffe/kaffe/Makefile.in
diff -u kaffe/kaffe/Makefile.in:1.204 kaffe/kaffe/Makefile.in:1.205
--- kaffe/kaffe/Makefile.in:1.204 Tue Jan 22 23:21:25 2008
+++ kaffe/kaffe/Makefile.in Sat Feb 2 15:26:45 2008
@@ -218,7 +218,6 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
-ZIP_LIBS = @ZIP_LIBS@
ZZIP_CFLAGS = @ZZIP_CFLAGS@
ZZIP_LIBS = @ZZIP_LIBS@
abs_builddir = @abs_builddir@
Index: kaffe/kaffe/jvmpi/Makefile.in
diff -u kaffe/kaffe/jvmpi/Makefile.in:1.130 kaffe/kaffe/jvmpi/Makefile.in:1.131
--- kaffe/kaffe/jvmpi/Makefile.in:1.130 Tue Jan 22 23:21:27 2008
+++ kaffe/kaffe/jvmpi/Makefile.in Sat Feb 2 15:26:46 2008
@@ -227,7 +227,6 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
-ZIP_LIBS = @ZIP_LIBS@
ZZIP_CFLAGS = @ZZIP_CFLAGS@
ZZIP_LIBS = @ZZIP_LIBS@
abs_builddir = @abs_builddir@
Index: kaffe/kaffe/kaffe/Makefile.in
diff -u kaffe/kaffe/kaffe/Makefile.in:1.229 kaffe/kaffe/kaffe/Makefile.in:1.230
--- kaffe/kaffe/kaffe/Makefile.in:1.229 Tue Jan 22 23:21:27 2008
+++ kaffe/kaffe/kaffe/Makefile.in Sat Feb 2 15:26:46 2008
@@ -230,7 +230,6 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
-ZIP_LIBS = @ZIP_LIBS@
ZZIP_CFLAGS = @ZZIP_CFLAGS@
ZZIP_LIBS = @ZZIP_LIBS@
abs_builddir = @abs_builddir@
Index: kaffe/kaffe/kaffeh/Makefile.in
diff -u kaffe/kaffe/kaffeh/Makefile.in:1.211 kaffe/kaffe/kaffeh/Makefile.in:1.212
--- kaffe/kaffe/kaffeh/Makefile.in:1.211 Tue Jan 22 23:21:28 2008
+++ kaffe/kaffe/kaffeh/Makefile.in Sat Feb 2 15:26:48 2008
@@ -231,7 +231,6 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
-ZIP_LIBS = @ZIP_LIBS@
ZZIP_CFLAGS = @ZZIP_CFLAGS@
ZZIP_LIBS = @ZZIP_LIBS@
abs_builddir = @abs_builddir@
Index: kaffe/kaffe/kaffevm/Makefile.in
diff -u kaffe/kaffe/kaffevm/Makefile.in:1.285 kaffe/kaffe/kaffevm/Makefile.in:1.286
--- kaffe/kaffe/kaffevm/Makefile.in:1.285 Tue Jan 22 23:21:29 2008
+++ kaffe/kaffe/kaffevm/Makefile.in Sat Feb 2 15:26:49 2008
@@ -293,7 +293,6 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
-ZIP_LIBS = @ZIP_LIBS@
ZZIP_CFLAGS = @ZZIP_CFLAGS@
ZZIP_LIBS = @ZZIP_LIBS@
abs_builddir = @abs_builddir@
Index: kaffe/kaffe/kaffevm/boehm-gc/Makefile.in
diff -u kaffe/kaffe/kaffevm/boehm-gc/Makefile.in:1.95 kaffe/kaffe/kaffevm/boehm-gc/Makefile.in:1.96
--- kaffe/kaffe/kaffevm/boehm-gc/Makefile.in:1.95 Tue Jan 22 23:21:30 2008
+++ kaffe/kaffe/kaffevm/boehm-gc/Makefile.in Sat Feb 2 15:26:49 2008
@@ -227,7 +227,6 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
-ZIP_LIBS = @ZIP_LIBS@
ZZIP_CFLAGS = @ZZIP_CFLAGS@
ZZIP_LIBS = @ZZIP_LIBS@
abs_builddir = @abs_builddir@
Index: kaffe/kaffe/kaffevm/gcj/Makefile.in
diff -u kaffe/kaffe/kaffevm/gcj/Makefile.in:1.184 kaffe/kaffe/kaffevm/gcj/Makefile.in:1.185
--- kaffe/kaffe/kaffevm/gcj/Makefile.in:1.184 Tue Jan 22 23:21:30 2008
+++ kaffe/kaffe/kaffevm/gcj/Makefile.in Sat Feb 2 15:26:49 2008
@@ -235,7 +235,6 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
-ZIP_LIBS = @ZIP_LIBS@
ZZIP_CFLAGS = @ZZIP_CFLAGS@
ZZIP_LIBS = @ZZIP_LIBS@
abs_builddir = @abs_builddir@
Index: kaffe/kaffe/kaffevm/intrp/Makefile.in
diff -u kaffe/kaffe/kaffevm/intrp/Makefile.in:1.193 kaffe/kaffe/kaffevm/intrp/Makefile.in:1.194
--- kaffe/kaffe/kaffevm/intrp/Makefile.in:1.193 Tue Jan 22 23:21:31 2008
+++ kaffe/kaffe/kaffevm/intrp/Makefile.in Sat Feb 2 15:26:50 2008
@@ -228,7 +228,6 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
-ZIP_LIBS = @ZIP_LIBS@
ZZIP_CFLAGS = @ZZIP_CFLAGS@
ZZIP_LIBS = @ZZIP_LIBS@
abs_builddir = @abs_builddir@
Index: kaffe/kaffe/kaffevm/jit/Makefile.in
diff -u kaffe/kaffe/kaffevm/jit/Makefile.in:1.203 kaffe/kaffe/kaffevm/jit/Makefile.in:1.204
--- kaffe/kaffe/kaffevm/jit/Makefile.in:1.203 Tue Jan 22 23:21:32 2008
+++ kaffe/kaffe/kaffevm/jit/Makefile.in Sat Feb 2 15:26:51 2008
@@ -236,7 +236,6 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
-ZIP_LIBS = @ZIP_LIBS@
ZZIP_CFLAGS = @ZZIP_CFLAGS@
ZZIP_LIBS = @ZZIP_LIBS@
abs_builddir = @abs_builddir@
Index: kaffe/kaffe/kaffevm/jit3/Makefile.in
diff -u kaffe/kaffe/kaffevm/jit3/Makefile.in:1.173 kaffe/kaffe/kaffevm/jit3/Makefile.in:1.174
--- kaffe/kaffe/kaffevm/jit3/Makefile.in:1.173 Tue Jan 22 23:21:32 2008
+++ kaffe/kaffe/kaffevm/jit3/Makefile.in Sat Feb 2 15:26:52 2008
@@ -236,7 +236,6 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
-ZIP_LIBS = @ZIP_LIBS@
ZZIP_CFLAGS = @ZZIP_CFLAGS@
ZZIP_LIBS = @ZZIP_LIBS@
abs_builddir = @abs_builddir@
Index: kaffe/kaffe/kaffevm/kaffe-gc/Makefile.in
diff -u kaffe/kaffe/kaffevm/kaffe-gc/Makefile.in:1.93 kaffe/kaffe/kaffevm/kaffe-gc/Makefile.in:1.94
--- kaffe/kaffe/kaffevm/kaffe-gc/Makefile.in:1.93 Tue Jan 22 23:21:33 2008
+++ kaffe/kaffe/kaffevm/kaffe-gc/Makefile.in Sat Feb 2 15:26:52 2008
@@ -228,7 +228,6 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
-ZIP_LIBS = @ZIP_LIBS@
ZZIP_CFLAGS = @ZZIP_CFLAGS@
ZZIP_LIBS = @ZZIP_LIBS@
abs_builddir = @abs_builddir@
Index: kaffe/kaffe/kaffevm/systems/Makefile.in
diff -u kaffe/kaffe/kaffevm/systems/Makefile.in:1.193 kaffe/kaffe/kaffevm/systems/Makefile.in:1.194
--- kaffe/kaffe/kaffevm/systems/Makefile.in:1.193 Tue Jan 22 23:21:34 2008
+++ kaffe/kaffe/kaffevm/systems/Makefile.in Sat Feb 2 15:26:52 2008
@@ -217,7 +217,6 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
-ZIP_LIBS = @ZIP_LIBS@
ZZIP_CFLAGS = @ZZIP_CFLAGS@
ZZIP_LIBS = @ZZIP_LIBS@
abs_builddir = @abs_builddir@
Index: kaffe/kaffe/kaffevm/systems/beos-native/Makefile.in
diff -u kaffe/kaffe/kaffevm/systems/beos-native/Makefile.in:1.184 kaffe/kaffe/kaffevm/systems/beos-native/Makefile.in:1.185
--- kaffe/kaffe/kaffevm/systems/beos-native/Makefile.in:1.184 Tue Jan 22 23:21:35 2008
+++ kaffe/kaffe/kaffevm/systems/beos-native/Makefile.in Sat Feb 2 15:26:53 2008
@@ -227,7 +227,6 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
-ZIP_LIBS = @ZIP_LIBS@
ZZIP_CFLAGS = @ZZIP_CFLAGS@
ZZIP_LIBS = @ZZIP_LIBS@
abs_builddir = @abs_builddir@
Index: kaffe/kaffe/kaffevm/systems/drops-l4threads/Makefile.in
diff -u kaffe/kaffe/kaffevm/systems/drops-l4threads/Makefile.in:1.48 kaffe/kaffe/kaffevm/systems/drops-l4threads/Makefile.in:1.49
--- kaffe/kaffe/kaffevm/systems/drops-l4threads/Makefile.in:1.48 Tue Jan 22 23:21:35 2008
+++ kaffe/kaffe/kaffevm/systems/drops-l4threads/Makefile.in Sat Feb 2 15:26:53 2008
@@ -222,7 +222,6 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
-ZIP_LIBS = @ZIP_LIBS@
ZZIP_CFLAGS = @ZZIP_CFLAGS@
ZZIP_LIBS = @ZZIP_LIBS@
abs_builddir = @abs_builddir@
Index: kaffe/kaffe/kaffevm/systems/oskit-pthreads/Makefile.in
diff -u kaffe/kaffe/kaffevm/systems/oskit-pthreads/Makefile.in:1.190 kaffe/kaffe/kaffevm/systems/oskit-pthreads/Makefile.in:1.191
--- kaffe/kaffe/kaffevm/systems/oskit-pthreads/Makefile.in:1.190 Tue Jan 22 23:21:36 2008
+++ kaffe/kaffe/kaffevm/systems/oskit-pthreads/Makefile.in Sat Feb 2 15:26:54 2008
@@ -227,7 +227,6 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
-ZIP_LIBS = @ZIP_LIBS@
ZZIP_CFLAGS = @ZZIP_CFLAGS@
ZZIP_LIBS = @ZZIP_LIBS@
abs_builddir = @abs_builddir@
Index: kaffe/kaffe/kaffevm/systems/unix-jthreads/Makefile.in
diff -u kaffe/kaffe/kaffevm/systems/unix-jthreads/Makefile.in:1.194 kaffe/kaffe/kaffevm/systems/unix-jthreads/Makefile.in:1.195
--- kaffe/kaffe/kaffevm/systems/unix-jthreads/Makefile.in:1.194 Tue Jan 22 23:21:36 2008
+++ kaffe/kaffe/kaffevm/systems/unix-jthreads/Makefile.in Sat Feb 2 15:26:54 2008
@@ -227,7 +227,6 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
-ZIP_LIBS = @ZIP_LIBS@
ZZIP_CFLAGS = @ZZIP_CFLAGS@
ZZIP_LIBS = @ZZIP_LIBS@
abs_builddir = @abs_builddir@
Index: kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.in
diff -u kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.170 kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.171
--- kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.in:1.170 Tue Jan 22 23:21:37 2008
+++ kaffe/kaffe/kaffevm/systems/unix-pthreads/Makefile.in Sat Feb 2 15:26:54 2008
@@ -232,7 +232,6 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
-ZIP_LIBS = @ZIP_LIBS@
ZZIP_CFLAGS = @ZZIP_CFLAGS@
ZZIP_LIBS = @ZZIP_LIBS@
abs_builddir = @abs_builddir@
Index: kaffe/kaffe/man/Makefile.in
diff -u kaffe/kaffe/man/Makefile.in:1.191 kaffe/kaffe/man/Makefile.in:1.192
--- kaffe/kaffe/man/Makefile.in:1.191 Tue Jan 22 23:21:37 2008
+++ kaffe/kaffe/man/Makefile.in Sat Feb 2 15:26:55 2008
@@ -211,7 +211,6 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
-ZIP_LIBS = @ZIP_LIBS@
ZZIP_CFLAGS = @ZZIP_CFLAGS@
ZZIP_LIBS = @ZZIP_LIBS@
abs_builddir = @abs_builddir@
Index: kaffe/kaffe/scripts/Makefile.in
diff -u kaffe/kaffe/scripts/Makefile.in:1.237 kaffe/kaffe/scripts/Makefile.in:1.238
--- kaffe/kaffe/scripts/Makefile.in:1.237 Tue Jan 22 23:21:38 2008
+++ kaffe/kaffe/scripts/Makefile.in Sat Feb 2 15:26:55 2008
@@ -227,7 +227,6 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
-ZIP_LIBS = @ZIP_LIBS@
ZZIP_CFLAGS = @ZZIP_CFLAGS@
ZZIP_LIBS = @ZZIP_LIBS@
abs_builddir = @abs_builddir@
Index: kaffe/kaffe/scripts/bat/Makefile.in
diff -u kaffe/kaffe/scripts/bat/Makefile.in:1.184 kaffe/kaffe/scripts/bat/Makefile.in:1.185
--- kaffe/kaffe/scripts/bat/Makefile.in:1.184 Tue Jan 22 23:21:38 2008
+++ kaffe/kaffe/scripts/bat/Makefile.in Sat Feb 2 15:26:56 2008
@@ -206,7 +206,6 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
-ZIP_LIBS = @ZIP_LIBS@
ZZIP_CFLAGS = @ZZIP_CFLAGS@
ZZIP_LIBS = @ZZIP_LIBS@
abs_builddir = @abs_builddir@
Index: kaffe/kaffe/scripts/compat/Makefile.in
diff -u kaffe/kaffe/scripts/compat/Makefile.in:1.212 kaffe/kaffe/scripts/compat/Makefile.in:1.213
--- kaffe/kaffe/scripts/compat/Makefile.in:1.212 Tue Jan 22 23:21:39 2008
+++ kaffe/kaffe/scripts/compat/Makefile.in Sat Feb 2 15:26:57 2008
@@ -215,7 +215,6 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
-ZIP_LIBS = @ZIP_LIBS@
ZZIP_CFLAGS = @ZZIP_CFLAGS@
ZZIP_LIBS = @ZZIP_LIBS@
abs_builddir = @abs_builddir@
Index: kaffe/kaffe/xprof/Makefile.in
diff -u kaffe/kaffe/xprof/Makefile.in:1.160 kaffe/kaffe/xprof/Makefile.in:1.161
--- kaffe/kaffe/xprof/Makefile.in:1.160 Tue Jan 22 23:21:40 2008
+++ kaffe/kaffe/xprof/Makefile.in Sat Feb 2 15:26:58 2008
@@ -246,7 +246,6 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
-ZIP_LIBS = @ZIP_LIBS@
ZZIP_CFLAGS = @ZZIP_CFLAGS@
ZZIP_LIBS = @ZZIP_LIBS@
abs_builddir = @abs_builddir@
Index: kaffe/libraries/Makefile.in
diff -u kaffe/libraries/Makefile.in:1.187 kaffe/libraries/Makefile.in:1.188
--- kaffe/libraries/Makefile.in:1.187 Tue Jan 22 23:21:40 2008
+++ kaffe/libraries/Makefile.in Sat Feb 2 15:26:58 2008
@@ -218,7 +218,6 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
-ZIP_LIBS = @ZIP_LIBS@
ZZIP_CFLAGS = @ZZIP_CFLAGS@
ZZIP_LIBS = @ZZIP_LIBS@
abs_builddir = @abs_builddir@
Index: kaffe/libraries/clib/Makefile.in
diff -u kaffe/libraries/clib/Makefile.in:1.209 kaffe/libraries/clib/Makefile.in:1.210
--- kaffe/libraries/clib/Makefile.in:1.209 Tue Jan 22 23:21:41 2008
+++ kaffe/libraries/clib/Makefile.in Sat Feb 2 15:26:58 2008
@@ -221,7 +221,6 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
-ZIP_LIBS = @ZIP_LIBS@
ZZIP_CFLAGS = @ZZIP_CFLAGS@
ZZIP_LIBS = @ZZIP_LIBS@
abs_builddir = @abs_builddir@
Index: kaffe/libraries/clib/awt/Makefile.in
diff -u kaffe/libraries/clib/awt/Makefile.in:1.202 kaffe/libraries/clib/awt/Makefile.in:1.203
--- kaffe/libraries/clib/awt/Makefile.in:1.202 Tue Jan 22 23:21:42 2008
+++ kaffe/libraries/clib/awt/Makefile.in Sat Feb 2 15:26:59 2008
@@ -228,7 +228,6 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
-ZIP_LIBS = @ZIP_LIBS@
ZZIP_CFLAGS = @ZZIP_CFLAGS@
ZZIP_LIBS = @ZZIP_LIBS@
abs_builddir = @abs_builddir@
Index: kaffe/libraries/clib/awt/X/Makefile.in
diff -u kaffe/libraries/clib/awt/X/Makefile.in:1.198 kaffe/libraries/clib/awt/X/Makefile.in:1.199
--- kaffe/libraries/clib/awt/X/Makefile.in:1.198 Tue Jan 22 23:21:42 2008
+++ kaffe/libraries/clib/awt/X/Makefile.in Sat Feb 2 15:26:59 2008
@@ -243,7 +243,6 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
-ZIP_LIBS = @ZIP_LIBS@
ZZIP_CFLAGS = @ZZIP_CFLAGS@
ZZIP_LIBS = @ZZIP_LIBS@
abs_builddir = @abs_builddir@
Index: kaffe/libraries/clib/awt/nano-X/Makefile.in
diff -u kaffe/libraries/clib/awt/nano-X/Makefile.in:1.69 kaffe/libraries/clib/awt/nano-X/Makefile.in:1.70
--- kaffe/libraries/clib/awt/nano-X/Makefile.in:1.69 Tue Jan 22 23:21:43 2008
+++ kaffe/libraries/clib/awt/nano-X/Makefile.in Sat Feb 2 15:26:59 2008
@@ -251,7 +251,6 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
-ZIP_LIBS = @ZIP_LIBS@
ZZIP_CFLAGS = @ZZIP_CFLAGS@
ZZIP_LIBS = @ZZIP_LIBS@
abs_builddir = @abs_builddir@
Index: kaffe/libraries/clib/awt/qt/Makefile.in
diff -u kaffe/libraries/clib/awt/qt/Makefile.in:1.150 kaffe/libraries/clib/awt/qt/Makefile.in:1.151
--- kaffe/libraries/clib/awt/qt/Makefile.in:1.150 Tue Jan 22 23:21:43 2008
+++ kaffe/libraries/clib/awt/qt/Makefile.in Sat Feb 2 15:26:59 2008
@@ -251,7 +251,6 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
-ZIP_LIBS = @ZIP_LIBS@
ZZIP_CFLAGS = @ZZIP_CFLAGS@
ZZIP_LIBS = @ZZIP_LIBS@
abs_builddir = @abs_builddir@
Index: kaffe/libraries/clib/awt/xynth/Makefile.in
diff -u kaffe/libraries/clib/awt/xynth/Makefile.in:1.25 kaffe/libraries/clib/awt/xynth/Makefile.in:1.26
--- kaffe/libraries/clib/awt/xynth/Makefile.in:1.25 Tue Jan 22 23:21:44 2008
+++ kaffe/libraries/clib/awt/xynth/Makefile.in Sat Feb 2 15:26:59 2008
@@ -243,7 +243,6 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
-ZIP_LIBS = @ZIP_LIBS@
ZZIP_CFLAGS = @ZZIP_CFLAGS@
ZZIP_LIBS = @ZZIP_LIBS@
abs_builddir = @abs_builddir@
Index: kaffe/libraries/clib/math/Makefile.in
diff -u kaffe/libraries/clib/math/Makefile.in:1.200 kaffe/libraries/clib/math/Makefile.in:1.201
--- kaffe/libraries/clib/math/Makefile.in:1.200 Tue Jan 22 23:21:44 2008
+++ kaffe/libraries/clib/math/Makefile.in Sat Feb 2 15:26:59 2008
@@ -237,7 +237,6 @@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
-ZIP_LIBS = @ZIP_LIBS@
ZZIP_CFLAGS = @ZZIP_CFLAGS@
ZZIP_LIBS = @ZZIP_LIBS@
abs_builddir = @abs_builddir@
*** Patch too long, truncated ***
More information about the kaffe
mailing list