PatchSet 7519
Date: 2007/08/07 13:38:17
Author: robilad
Branch: HEAD
Tag: (none)
Log:
2007-08-07 Dalibor Topic <[EMAIL PROTECTED]>
* configure.ac: Abort if headers or libary required for
boehm-gc can not be found.
Members:
ChangeLog:1.5017->1.5018
configure:1.591->1.592
configure.ac:1.265->1.266
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5017 kaffe/ChangeLog:1.5018
--- kaffe/ChangeLog:1.5017 Tue Aug 7 13:21:30 2007
+++ kaffe/ChangeLog Tue Aug 7 13:38:17 2007
@@ -1,5 +1,10 @@
2007-08-07 Dalibor Topic <[EMAIL PROTECTED]>
+ * configure.ac: Abort if headers or libary required for
+ boehm-gc can not be found.
+
+2007-08-07 Dalibor Topic <[EMAIL PROTECTED]>
+
* config/x86_64/common.h (ALIGNMENTOF_VOIDP_IN_STACK):
Undefine previous definition from defs.h, before redefining it.
Index: kaffe/configure
diff -u kaffe/configure:1.591 kaffe/configure:1.592
--- kaffe/configure:1.591 Tue Aug 7 10:54:57 2007
+++ kaffe/configure Tue Aug 7 13:38:17 2007
@@ -1763,8 +1763,6 @@
--without-suncompat Don't include Sun compatibility scripts
--with-threads=SYSTEM Define which threading system to use
[default=unix-pthreads]
- --with-gc=GC Force use given execution engine (kaffe-gc or
- boehm-gc)
--with-system-classpath use the system install of GNU Classpath (per default
in /usr/local/classpath)
--with-classpath-prefix=<dir>
@@ -1788,6 +1786,8 @@
use jikes +Pno-switchcheck +Pno-shadow +E
--with-libffi Use libffi for sysdepCallMethod
--without-gmp don't use GNU multiple precision arithmetic library
+ --with-gc=GC Force use given execution engine (kaffe-gc or
+ boehm-gc)
--with-stats Gather statistics on vm execution
--with-kaffe-x-awt enable build of Kaffe's Xlib-based AWT engine (not
built by default)
@@ -25972,32 +25972,6 @@
-
-
-
-# Check whether --with-gc was given.
-if test "${with_gc+set}" = set; then
- withval=$with_gc; GC_NAME="$withval"
-
-fi
-
-
-
-if test x$GC_NAME = xboehm-gc ; then
- if test x"$with_threads" != x"unix-pthreads"; then
- { { echo "$as_me:$LINENO: error: BoehmGC only supports unix-pthreads
threads. Please switch to unix-pthreads using --with-threads=unix-pthreads or
use the standard kaffe's gc." >&5
-echo "$as_me: error: BoehmGC only supports unix-pthreads threads. Please
switch to unix-pthreads using --with-threads=unix-pthreads or use the standard
kaffe's gc." >&2;}
- { (exit 1); exit 1; }; }
- fi
-
-
-cat >>confdefs.h <<\_ACEOF
-#define KAFFE_BOEHM_GC 1
-_ACEOF
-
-fi
-
-
# Check whether --enable-portable-native-sync was given.
if test "${enable_portable_native_sync+set}" = set; then
enableval=$enable_portable_native_sync; case "${enableval}" in
@@ -33792,6 +33766,41 @@
fi
+
+
+# Check whether --with-gc was given.
+if test "${with_gc+set}" = set; then
+ withval=$with_gc; GC_NAME="$withval"
+
+fi
+
+
+
+if test x$GC_NAME = xboehm-gc ; then
+ if test x"$with_threads" != x"unix-pthreads"; then
+ { { echo "$as_me:$LINENO: error: boehm-gc only supports unix-pthreads
threads. Please switch to unix-pthreads using --with-threads=unix-pthreads or
use kaffe-gc." >&5
+echo "$as_me: error: boehm-gc only supports unix-pthreads threads. Please
switch to unix-pthreads using --with-threads=unix-pthreads or use kaffe-gc."
>&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+ if test x$ac_cv_header_gc_gc_h = xno ; then
+ { { echo "$as_me:$LINENO: error: boehm-gc headers not found." >&5
+echo "$as_me: error: boehm-gc headers not found." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+ if test x$ac_cv_lib_gc_GC_free = xno; then
+ { { echo "$as_me:$LINENO: error: boehm-gc library not found." >&5
+echo "$as_me: error: boehm-gc library not found." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+
+cat >>confdefs.h <<\_ACEOF
+#define KAFFE_BOEHM_GC 1
+_ACEOF
+
+fi
Index: kaffe/configure.ac
diff -u kaffe/configure.ac:1.265 kaffe/configure.ac:1.266
--- kaffe/configure.ac:1.265 Tue Aug 7 01:44:47 2007
+++ kaffe/configure.ac Tue Aug 7 13:38:18 2007
@@ -720,27 +720,6 @@
AC_SUBST(VM_LIBS)
-dnl =========================================================================
-dnl Select the right garbage collector.
-dnl -------------------------------------------------------------------------
-
-
-AC_ARG_WITH([gc],
- AS_HELP_STRING([--with-gc=GC],
- [Force use given execution engine (kaffe-gc or
boehm-gc)]),
- [ GC_NAME="$withval" ]
-)
-
-
-if test x$GC_NAME = xboehm-gc ; then
- if test x"$with_threads" != x"unix-pthreads"; then
- AC_MSG_ERROR(BoehmGC only supports unix-pthreads threads. Please switch
to unix-pthreads using --with-threads=unix-pthreads or use the standard kaffe's
gc.)
- fi
-
- AC_DEFINE([KAFFE_BOEHM_GC], 1, [Defined if we are using the Boehm-Weiser
garbage collector])
-fi
-
-
dnl -----------------------------------------------------------
dnl This sets the build-time default, which can now be overridden
dnl by setting the system property gnu.classpath.awt.gtk.portable.native.sync
@@ -1312,6 +1291,29 @@
dnl =========================================================================
dnl Select GC to use
dnl -------------------------------------------------------------------------
+
+AC_ARG_WITH([gc],
+ AS_HELP_STRING([--with-gc=GC],
+ [Force use given execution engine (kaffe-gc or
boehm-gc)]),
+ [ GC_NAME="$withval" ]
+)
+
+
+if test x$GC_NAME = xboehm-gc ; then
+ if test x"$with_threads" != x"unix-pthreads"; then
+ AC_MSG_ERROR([boehm-gc only supports unix-pthreads threads. Please
switch to unix-pthreads using --with-threads=unix-pthreads or use kaffe-gc.])
+ fi
+
+ if test x$ac_cv_header_gc_gc_h = xno ; then
+ AC_MSG_ERROR([boehm-gc headers not found.])
+ fi
+
+ if test x$ac_cv_lib_gc_GC_free = xno; then
+ AC_MSG_ERROR([boehm-gc library not found.])
+ fi
+
+ AC_DEFINE([KAFFE_BOEHM_GC], 1, [Defined if we are using the Boehm-Weiser
garbage collector])
+fi
KAFFE_CHECK_GLIBC_VER
_______________________________________________
kaffe mailing list
kaffe@kaffe.org
http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
