i386* | i486* | i586* | i686* )
ARCH_DIR="i386"
- CFLAGS="-Wall -O2 -g3 -D__I386__"
+ CFLAGS="-Wall -O0 -g3 -D__I386__"
AC_DEFINE([TRACE_ARGS_NUM], 8, [Defines integer argument register count])
AC_DEFINE([USE_CODEMMAP], 1, [use code mmap])
;;
mips* )
ARCH_DIR="mips"
- CFLAGS="-64 -O2 -OPT:Olimit=0 -g -DMAP_ANONYMOUS=0 -woff 1110,1164,1515 -D__MIPS__"
+ CFLAGS="-64 -O2 -OPT:Olimit=0 -g -DMAP_ANONYMOUS=0 -woff 1110,1164,1515 -D__MIPS__"
LIBS="-lelfutil"
AC_DEFINE([TRACE_ARGS_NUM], 8, [Defines integer argument register count])
;;
case "$host_os" in
*linux* | *Linux* )
- CFLAGS="$CFLAGS -D__LINUX__"
+ CFLAGS="$CFLAGS -D__LINUX__ -D_POSIX_C_SOURCE=199506L -D_XOPEN_SOURCE=500 -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE"
;;
*darwin* )
CFLAGS="$CFLAGS -D__DARWIN__"
;;
+*irix* )
+ CFLAGS="$CFLAGS -D__IRIX__"
+ ;;
* )
;;
esac
dnl Features
dnl check arguments
-AC_ARG_ENABLE(threads, [ --enable-threads enable threads support [default=yes]])
-AC_ARG_ENABLE([__thread],
- [ --disable-__thread do not use TLS features even when supporting them],
- [use__thread=$enablevalval],
- [use__thread=yes])
+AC_ARG_ENABLE([threads], [AS_HELP_STRING(--enable-threads,enable threads support (none,green,native) [[default=native]])])
+AC_ARG_ENABLE([__thread], [AS_HELP_STRING(--disable-__thread,do not use TLS features even when supporting them)], [use__thread=$enablevalval], [use__thread=yes])
dnl threads
AC_MSG_CHECKING(whether to include threads support)
-if test x"$enable_threads" = "xno"; then
+enable_threads=${enable_threads:-native}
+case "$enable_threads" in
+no | none | single)
AC_MSG_RESULT(no)
-else
- AC_MSG_RESULT(yes)
-
+ dnl no threads for boehm
+ ac_configure_args="$ac_configure_args --disable-boehm-threads"
+ ;;
+green | native | posix | pthreads)
AC_DEFINE([USE_THREADS], 1, [use threads])
AC_DEFINE([EXTERNAL_OVERFLOW], 1, [external overflow])
AC_DEFINE([DONT_FREE_FIRST], 1, [don't free first])
LIBTHREAD="libthreads.a"
THREAD_OBJ="threads/libthreads.a"
- THREAD_LIB=-lpthread
AC_SUBST(LIBTHREAD)
AC_SUBST(THREAD_OBJ)
- AC_SUBST(THREAD_LIB)
-fi
+
+ if test x"$enable_threads" != "xgreen"; then
+ AC_DEFINE([NATIVE_THREADS], 1, [use pthreads])
+ THREAD_LIB="-lpthread"
+ AC_SUBST(THREAD_LIB)
+ AC_MSG_RESULT(yes, native)
+ AC_CHECK_LIB(pthread, main)
+
+ CFLAGS="$CFLAGS -D_REENTRANT"
+
+ dnl tell boehm to support threads as well and classpath to
+ dnl synchronize VM threads portably
+ ac_configure_args="$ac_configure_args --enable-boehm-threads=posix --enable-portable-native-sync"
+ else
+ AC_MSG_RESULT(yes, green)
+
+ dnl no threads for boehm
+ ac_configure_args="$ac_configure_args --disable-boehm-threads"
+ fi
+ ;;
+*)
+ AC_MSG_ERROR($enable_threads is an unknown thread package)
+ ;;
+esac
+
dnl Check whether the compiler supports the __thread keyword.
if test "x$use__thread" != xno; then
ac_cv_gcc___thread=no
fi
+
dnl check if zlib should be used
-AC_ARG_ENABLE(zlib, [ --enable-zlib enable zip archive class storage (experimental), needs zlib [default=no]])
+AC_ARG_ENABLE([zlib], [AS_HELP_STRING(--enable-zlib,enable zip archive class storage (needs zlib) [[default=yes]])])
AC_MSG_CHECKING(whether zip archives should be supported)
-if test x"$enable_zlib" = "xyes"; then
+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)
-
-else
- ZIP_LIBS=""
- ZIP_C=""
- AC_MSG_RESULT(no)
-
+ AC_CHECK_LIB(z, main)
fi
AC_SUBST(ZIP_LIBS)
AC_SUBST(ZIP_C)
+
+dnl set some essential classpath options, even if their classpath default is
+dnl suitable for us
+ac_configure_args="$ac_configure_args --enable-jni --disable-cni --disable-regen-headers --enable-static --enable-shared --enable-load-library"
+
+
dnl check arguments
-AC_ARG_ENABLE(gtk-peer, [ --enable-gtk-peer enable threads support [default=no]])
+AC_ARG_ENABLE([gtk-peer], [AS_HELP_STRING(--enable-gtk-peer,compile GTK native peers [[default=no]])])
-dnl threads
+
+dnl enable gtk peer
AC_MSG_CHECKING(whether to use gtk awt peers)
if test x"$enable_gtk_peer" = "xyes"; then
AC_MSG_RESULT(yes)
AWTPEERS="java.awt.peer.ComponentPeer \
+ java.awt.Graphics\
+ java.awt.Window\
java.awt.peer.MenuPeer \
java.awt.peer.MenuItemPeer \
gnu.java.awt.peer.gtk.GdkPixbufDecoder \
+ gnu.java.awt.peer.gtk.GtkGenericPeer \
gnu.java.awt.peer.gtk.GtkMenuBarPeer \
gnu.java.awt.peer.gtk.GtkScrollPanePeer \
gnu.java.awt.peer.gtk.GtkMenuPeer \
gnu.java.awt.peer.gtk.GtkTextComponentPeer \
gnu.java.awt.peer.gtk.GtkComponentPeer \
gnu.java.awt.peer.gtk.GtkPopupMenuPeer \
+ gnu.java.awt.peer.gtk.GtkCheckboxPeer \
gnu.java.awt.peer.gtk.GtkCheckboxGroupPeer \
gnu.java.awt.peer.gtk.GtkMenuItemPeer \
gnu.java.awt.peer.gtk.GdkGraphics \
gnu.java.awt.peer.gtk.GtkFramePeer \
gnu.java.awt.peer.gtk.GdkFontMetrics \
gnu.java.awt.peer.gtk.GtkScrollbarPeer \
- gnu.java.awt.peer.gtk.GtkGenericPeer \
gnu.java.awt.peer.gtk.GtkListPeer \
gnu.java.awt.peer.gtk.GtkLabelPeer \
gnu.java.awt.peer.gtk.GtkTextAreaPeer \
- gnu.java.awt.peer.gtk.GtkCheckboxPeer \
gnu.java.awt.peer.gtk.GtkFileDialogPeer \
gnu.java.awt.peer.gtk.GtkImagePainter \
gnu.java.awt.peer.gtk.GtkChoicePeer \
gnu.java.awt.peer.gtk.GtkCheckboxMenuItemPeer \
gnu.java.awt.peer.gtk.GtkClipboard \
gnu.java.awt.peer.gtk.GtkWindowPeer"
- AWT_OBJS="gnuclasspathnat/native/jni/gtk-peer/.libs/libgtkpeer.a \
+ AWT_OBJS="classpath/native/jni/gtk-peer/.libs/libgtkpeer.a \
-lgtk-x11-2.0 -lgdk-x11-2.0 -latk-1.0 -lgdk_pixbuf-2.0 -lm -lpangoxft-1.0 \
-lpangox-1.0 -lpango-1.0 -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 \
-lgthread-2.0 -lart_lgpl_2"
AC_SUBST(AWTPEERS)
AC_SUBST(AWT_OBJS)
AC_MSG_RESULT(no)
+
+ ac_configure_args="$ac_configure_args --disable-gtk-peer"
fi
+
dnl now configure boehm gc and gnu classpath
dnl the export is not my favorite (is there another way?)
export CFLAGS
-AC_CONFIG_SUBDIRS(mm/boehm-gc gnuclasspathnat)
+AC_CONFIG_SUBDIRS(mm/boehm-gc classpath)
+
AC_OUTPUT(Makefile \
mm/Makefile \
projects / cacao.git / blobdiff