case "$host_cpu" in
alpha* )
ARCH_DIR="alpha"
- CFLAGS="-mieee -O0 -g3 -D__ALPHA__"
+ CFLAGS="-mieee -O2 -g3 -D__ALPHA__"
AC_DEFINE(TRACE_ARGS_NUM, 6)
AC_DEFINE(USE_CODEMMAP)
;;
i386* | i486* | i586* | i686* )
ARCH_DIR="i386"
- CFLAGS="-Wall -O0 -g3 -D__I386__"
+ CFLAGS="-Wall -O2 -g3 -D__I386__"
AC_DEFINE(TRACE_ARGS_NUM, 8)
AC_DEFINE(USE_CODEMMAP)
;;
x86_64* )
ARCH_DIR="x86_64"
- CFLAGS="-O0 -g3 -D__X86_64__"
+ CFLAGS="-O2 -g3 -D__X86_64__"
AC_DEFINE(TRACE_ARGS_NUM, 6)
AC_DEFINE(USE_CODEMMAP)
;;
AC_FUNC_MMAP
AC_TYPE_SIGNAL
AC_CHECK_FUNCS(getcwd gettimeofday mkdir mktime select socket)
+AC_CHECK_FUNCS(copysign copysignf)
+AC_CHECK_FUNCS(finite finitef)
+AC_CHECK_FUNCS(fmod fmodf)
+AC_CHECK_FUNCS(isnan isnanf)
dnl Check for mmap header anomalies (missing MAP_FAILED, etc.)
if test $ac_cv_func_mmap_fixed_mapped = yes; then
dnl Features
dnl check arguments
-AC_ARG_ENABLE(threads, [ --enable-threads enable threads support])
+AC_ARG_ENABLE(threads, [ --enable-threads enable threads support [default yes]])
+AC_ARG_ENABLE([__thread],
+ AC_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)
AC_SUBST(THREAD_OBJ)
fi
+dnl Check whether the compiler supports the __thread keyword.
+if test "x$use__thread" != xno; then
+ AC_CACHE_CHECK([for __thread], ac_cv_gcc___thread,
+ [cat > conftest.c <<\EOF
+__thread int a = 42;
+EOF
+ if AC_TRY_COMMAND([${CC-cc} $CFLAGS -c conftest.c >&AS_MESSAGE_LOG_FD]); then
+ ac_cv_gcc___thread=yes
+ else
+ ac_cv_gcc___thread=no
+ fi
+ rm -f conftest*])
+ if test "$ac_cv_gcc___thread" = yes; then
+ AC_DEFINE(HAVE___THREAD)
+ fi
+else
+ ac_cv_gcc___thread=no
+fi
+
dnl now configure boehm gc
AC_CONFIG_SUBDIRS(mm/boehm-gc)
+
+AC_ARG_WITH(classcompiler, [ --with-classcompiler[=ARG] compiler for creating classpath [jikes,javac13,complang] [default=javac13]])
+
+dnl java compiler
+AC_MSG_CHECKING(which java compiler to use to use)
+case "$with_classcompiler" in
+jikes )
+ AC_MSG_RESULT(jikes (good luck, doesn't seem to really work))
+ CCOMP="jikes"
+ ;;
+complang )
+ AC_MSG_RESULT(complang, make sure that CLASSPATH is set correctly)
+ CCOMP="complang"
+ ;;
+* | "")
+ AC_MSG_RESULT(javac13 (with -target 1.1))
+ CCOMP="javac13complang"
+ ;;
+esac
+
+
+dnl check if zlib should be used
+AC_ARG_ENABLE(zlib, [ --enable-zlib enable zip archive class storage (experimental), needs zlib [default no]])
+
+AC_MSG_CHECKING(whether zip archives should be supported)
+if test x"$enable_zlib" = "xyes"; then
+ ZIP_LIBS=-lz
+ ZIP_C=unzip.c
+ AC_DEFINE(USE_ZLIB)
+ AC_MSG_RESULT(yes)
+
+else
+ ZIP_LIBS=""
+ ZIP_C=""
+ AC_MSG_RESULT(no)
+
+fi
+AC_SUBST(ZIP_LIBS)
+AC_SUBST(ZIP_C)
+
+dnl check arguments
+AC_ARG_ENABLE(gtkpeer, [ --enable-gtkpeer enable threads support [default no]])
+
+dnl threads
+AC_MSG_CHECKING(whether to use gtk awt peers)
+if test x"$enable_gtkpeer" = "xyes"; then
+ AC_MSG_RESULT(yes)
+ AWTPEERS="java.awt.peer.ComponentPeer \
+ java.awt.peer.MenuPeer \
+ java.awt.peer.MenuItemPeer \
+ gnu.java.awt.peer.gtk.GdkPixbufDecoder \
+ 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.GtkCheckboxGroupPeer \
+ gnu.java.awt.peer.gtk.GtkMenuItemPeer \
+ gnu.java.awt.peer.gtk.GdkGraphics \
+ gnu.java.awt.peer.gtk.GtkToolkit \
+ gnu.java.awt.peer.gtk.GtkCanvasPeer \
+ 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.GtkPanelPeer \
+ gnu.java.awt.peer.gtk.GtkMainThread \
+ gnu.java.awt.peer.gtk.GtkButtonPeer \
+ gnu.java.awt.peer.gtk.GtkTextFieldPeer \
+ gnu.java.awt.peer.gtk.GtkCheckboxMenuItemPeer \
+ gnu.java.awt.peer.gtk.GtkClipboard \
+ gnu.java.awt.peer.gtk.GtkWindowPeer"
+ AWT_OBJS="classpathbin/$ARCH_DIR/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"
+ USEGTK=yes
+ AC_SUBST(USEGTK)
+ AC_SUBST(AWTPEERS)
+ AC_SUBST(AWT_OBJS)
+ AC_DEFINE(USE_GTK)
+
+else
+ AWT_OBJS=
+ AWTPEERS=
+ USEGTK=no
+ AC_SUBST(USEGTK)
+ AC_SUBST(AWTPEERS)
+ AC_SUBST(AWT_OBJS)
+ AC_MSG_RESULT(no)
+fi
+
AC_OUTPUT(Makefile \
mm/Makefile \
toolbox/Makefile \
doc/Makefile \
tst/Makefile \
tst/kaffe/Makefile \
- jvmtst/Makefile )
+ jvmtst/Makefile \
+ classpathbin/Makefile)
+
+
+cd classpathbin/$ARCH_DIR
+echo "========================================================================"
+echo "calling: ../../gnuclasspath/configure --prefix=$prefix/classpath --with-$CCOMP=yes --enable-jni=yes --enable-gtk-peer=$USEGTK --enable-shared=no --enable-static=yes --with-zip=no --enable-portable-native-sync"
+echo "========================================================================"
+
+../../gnuclasspath/configure --prefix=$prefix/classpath --with-$CCOMP=yes \
+ --enable-jni=yes --enable-gtk-peer=$USEGTK --enable-shared=no --enable-static=yes --with-zip=no \
+ --enable-portable-native-sync
+cd ../..
+
+
+