Index: configure.in
===================================================================
RCS file: /home/cvspublic/kaffe/configure.in,v
retrieving revision 1.60
diff -u -r1.60 configure.in
--- configure.in	1999/01/14 20:36:44	1.60
+++ configure.in	1999/01/15 18:03:52
@@ -13,7 +13,7 @@
 dnl Allow specification of header-file and library directories
 dnl -------------------------------------------------------------------------
 
-AC_ARG_WITH(includes,[  --with-includes=dirs     Search specified directories for header files], CPPFLAGS="$CPPFLAGS"`echo " $withval" | sed 's/ / -I/g'`)
+AC_ARG_WITH(includes,[  --with-includes=dirs    Search specified directories for header files], CPPFLAGS="$CPPFLAGS"`echo " $withval" | sed 's/ / -I/g'`)
 AC_ARG_WITH(libraries,[  --with-libraries=dirs   Search specified directories for libraries], LDFLAGS="$LDFLAGS"`echo " $withval" | sed 's/ / -L/g'`)
 
 dnl Find the compiler early on in case we need to override.
@@ -82,9 +82,9 @@
 dnl Configure libtool
 dnl -------------------------------------------------------------------------
 
-case "$with_staticlib,$with_staticvm" in
-yes,yes) AM_DISABLE_SHARED;;
-no,no) AM_DISABLE_STATIC;;
+case "$dynamic_libraries,$vm_dynamic_library" in
+yes,yes) AM_DISABLE_STATIC;;
+no,no) AM_DISABLE_SHARED;;
 # otherwise, we should compile everything twice
 esac
 
@@ -435,7 +435,7 @@
 dnl Do we build a timing measuring vm?
 dnl -------------------------------------------------------------------------
 
-AC_ARG_WITH(timing,[  --with-timing              Time vm execution])
+AC_ARG_WITH(timing,[  --with-timing           Time vm execution])
 
 if test "$with_timing" = "yes" ; then
 	if test $have_rusage = "no" ; then
Index: kaffe/kaffe/main.c
===================================================================
RCS file: /home/cvspublic/kaffe/kaffe/kaffe/main.c,v
retrieving revision 1.17
diff -u -r1.17 main.c
--- main.c	1999/01/07 21:03:17	1.17
+++ main.c	1999/01/15 18:03:55
@@ -64,7 +64,7 @@
 
 	JNI_GetDefaultJavaVMInitArgs(&vmargs);
 
-	lt_dlpreopen_default();
+	lt_dlpreopen_default(NULL);
 
 	cp = getenv(CLASSPATH1);
 	if (cp == 0) {
Index: kaffe/kaffevm/mem/gc-incremental.c
===================================================================
RCS file: /home/cvspublic/kaffe/kaffe/kaffevm/mem/gc-incremental.c,v
retrieving revision 1.35
diff -u -r1.35 gc-incremental.c
--- gc-incremental.c	1999/01/14 20:35:31	1.35
+++ gc-incremental.c	1999/01/15 18:04:16
@@ -30,14 +30,14 @@
 #include "stringSupport.h"
 
 static gcList gclists[5];
-static int mustfree = 4;		/* temporary list */
-static int white = 3;
-static int grey = 2;
-static int black = 1;
-static int finalise = 0;
+static const int mustfree = 4;		/* temporary list */
+static const int white = 3;
+static const int grey = 2;
+static const int black = 1;
+static const int finalise = 0;
 
-static int gcRunning = 0;
-static bool finalRunning = false;
+static volatile int gcRunning = 0;
+static volatile bool finalRunning = false;
 static timespent gc_time;
 static timespent sweep_time;