From ffdbd830399737fafafd0195dc03d1632e0b229b Mon Sep 17 00:00:00 2001
From: twisti <none@none>
Date: Tue, 23 Nov 2004 16:05:40 +0000
Subject: [PATCH] Further changes.

---
 Makefile.am  | 34 +++++++++++++++-------------------
 configure.in | 21 +++++++--------------
 2 files changed, 22 insertions(+), 33 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index e2c95e307..b59781d95 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-# $Id: Makefile.am 1548 2004-11-18 13:02:27Z twisti $
+# $Id: Makefile.am 1572 2004-11-23 16:05:40Z twisti $
 
 @SET_MAKE@
 
@@ -27,6 +27,10 @@ INCLUDES = -I$(top_srcdir)/jit/@ARCH_DIR@
 
 BOEHM_LIBS = mm/libboehm.a mm/boehm-gc/.libs/libgc.a
 
+if USE_ZLIB
+ZLIB_OBJ = unzip.c
+endif
+
 cacao_SOURCES = \
 	builtin.c \
 	exceptions.c \
@@ -38,7 +42,7 @@ cacao_SOURCES = \
 	statistics.c \
 	tables.c \
 	typeinfo.c \
-	unzip.c
+	$(ZLIB_OBJ)
 
 cacao_LDADD = \
 	jit/libjit.a \
@@ -50,9 +54,7 @@ cacao_LDADD = \
 	toolbox/libtoolbox.a \
         @STATIC_CLASSPATH_LIBS@ \
         @DYNAMIC_CLASSPATH_LIBS@ \
-	@AWT_OBJS@ \
-	@ZIP_LIBS@ \
-	@THREAD_LIB@
+	@AWT_OBJS@
 
 
 cacao_DEPENDENCIES = \
@@ -76,15 +78,13 @@ cacaoh_SOURCES = \
 	options.c \
 	statistics.c \
 	tables.c \
-	unzip.c
+	$(ZLIB_OBJ)
 
 cacaoh_LDADD = \
 	$(BOEHM_LIBS) \
 	classpath/native/jni/java-lang/.libs/libjavalang.a \
 	@THREAD_OBJ@ \
-	@ZIP_LIBS@ \
-	toolbox/libtoolbox.a \
-	@THREAD_LIB@
+	toolbox/libtoolbox.a
 
 cacaoh_DEPENDENCIES = \
 	$(BOEHM_LIBS) \
@@ -101,25 +101,21 @@ gennativetable_SOURCES = \
 	options.c \
 	tables.c \
 	statistics.c \
-	unzip.c
+	$(ZLIB_OBJ)
 
 gennativetable_LDADD = \
 	$(BOEHM_LIBS) \
 	classpath/native/jni/java-lang/.libs/libjavalang.a \
 	@THREAD_OBJ@ \
-	@ZIP_LIBS@ \
-	toolbox/libtoolbox.a \
-	@THREAD_LIB@
+	toolbox/libtoolbox.a
 
 gennativetable_DEPENDENCIES = \
 	$(BOEHM_LIBS) \
 	classpath/native/jni/java-lang/.libs/libjavalang.a \
 	@THREAD_OBJ@ \
-	@ZIP_LIBS@ \
-	toolbox/libtoolbox.a \
-	@THREAD_LIB@
+	toolbox/libtoolbox.a
 
-all: cacaoh natheaders genoffsets gennativetable cacao
+all: cacaoh genoffsets gennativetable cacao
 
 mm/libboehm.a:
 	make -C mm
@@ -157,7 +153,8 @@ nat/implementednatives.data:
 native.c: nativetable.inc
 
 CLASSES= \
-	java.lang.Cloneable \
+	java.lang.JOWENNTest1 \
+	\
 	java.lang.reflect.Field \
 	java.lang.SecurityManager \
 	java.net.DatagramPacket \
@@ -199,7 +196,6 @@ CLASSES= \
 	java.lang.Double \
 	java.lang.Float \
 	java.lang.Integer \
-	java.lang.JOWENNTest1 \
 	java.lang.Long \
 	java.lang.Math \
 	java.lang.Process \
diff --git a/configure.in b/configure.in
index 3e2f56364..415d88bd2 100644
--- a/configure.in
+++ b/configure.in
@@ -1,11 +1,12 @@
-cdnl autoconf; autoheader; automake
+dnl autoconf; autoheader; automake
 
 dnl Process this file with autoconf to produce a configure script.
-AC_INIT([main.c])
+AC_INIT(cacao, 0.40, cacao@complang.tuwien.ac.at)
+AC_CONFIG_SRCDIR(main.c)
 AC_CANONICAL_HOST
-
 AC_PREREQ(2.59)
-AM_INIT_AUTOMAKE(cacao, 0.40)
+AM_INIT_AUTOMAKE
+
 AM_CONFIG_HEADER([config.h])
 
 AC_PREFIX_DEFAULT(/usr/local/cacao)
@@ -25,8 +26,6 @@ i386* | i486* | i586* | i686* )
 	ARCH_DIR="i386"
         STATIC_CLASSPATH="0"
 	CFLAGS="-D__I386__"
-	AC_DEFINE([TRACE_ARGS_NUM], 8, [Defines integer argument register count])
-	AC_DEFINE([USE_CODEMMAP], 1, [use code mmap])
 	;;
 
 mips* )
@@ -48,8 +47,6 @@ x86_64* )
 	ARCH_DIR="x86_64"
         STATIC_CLASSPATH="1"
 	CFLAGS="-D__X86_64__"
-	AC_DEFINE([TRACE_ARGS_NUM], 6, [Defines integer argument register count])
-	AC_DEFINE([USE_CODEMMAP], 1, [use code mmap])
 	;;
 
 sparc* | * )
@@ -243,18 +240,14 @@ AC_ARG_ENABLE([zlib], [AS_HELP_STRING(--enable-zlib,enable zip archive class sto
 
 AC_MSG_CHECKING(whether zip archives should be supported)
 if test x"$enable_zlib" = "xno"; then
-	ZIP_LIBS=""
-	ZIP_C=""
 	AC_MSG_RESULT(no)
 else
-	ZIP_LIBS="-lz"
-	ZIP_C="unzip.c"
 	AC_DEFINE([USE_ZLIB], 1, [use zlib])
 	AC_MSG_RESULT(yes)
+        AC_CHECK_HEADERS([zlib.h])
         AC_CHECK_LIB(z, main)
 fi
-AC_SUBST(ZIP_LIBS)
-AC_SUBST(ZIP_C)
+AM_CONDITIONAL([USE_ZLIB], [test x"$enable_zlib" != "xno"])
 
 
 dnl set some essential classpath options, even if their classpath default is
-- 
2.25.1