-dnl autoconf; autoheader; automake
+cdnl autoconf; autoheader; automake
dnl Process this file with autoconf to produce a configure script.
-AC_INIT(compiler.c)
+AC_INIT(main.c)
AC_CANONICAL_HOST
AM_INIT_AUTOMAKE(cacao, 0.40)
case "$host_cpu" in
alpha* )
- SYSDEP_DIR="alpha"
- CFLAGS="-ieee -O2 -g3"
- COMPILER_SOURCES="compiler.h compiler.c"
- COMPILER_OBJECTS="compiler.o"
- AC_DEFINE(OLD_COMPILER)
+ ARCH_DIR="alpha"
+ CFLAGS="-Wall -O2 -g3 -mieee -D__ALPHA__"
+ AC_DEFINE(TRACE_ARGS_NUM, 6)
+ AC_DEFINE(USE_CODEMMAP)
+ ;;
+
+i386* | i486* | i586* | i686* )
+ ARCH_DIR="i386"
+ CFLAGS="-Wall -O2 -g3 -D__I386__"
+ AC_DEFINE(TRACE_ARGS_NUM, 8)
+ AC_DEFINE(USE_CODEMMAP)
;;
mips* )
- SYSDEP_DIR="mips"
- CFLAGS="-64 -g -DMAP_ANONYMOUS=0 -woff 1048,1110,1164,1515"
-dnl LIBS="-lelfutil"
- COMPILER_SOURCES=""
- COMPILER_OBJECTS=""
+ ARCH_DIR="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)
;;
-sparc* | powerpc* | ppc* | * )
- AC_MSG_ERROR($host-cpu systems are not supported at this time) ;;
+powerpc* | ppc* )
+ ARCH_DIR="powerpc"
+ CFLAGS="-Wall -O2 -g -DMAP_ANONYMOUS=0 -no-cpp-precomp -D__POWERPC__"
+ AC_DEFINE(TRACE_ARGS_NUM, 8)
+ ;;
+
+x86_64* )
+ ARCH_DIR="x86_64"
+ CFLAGS="-Wall -O2 -g3 -D__X86_64__"
+ AC_DEFINE(TRACE_ARGS_NUM, 6)
+ AC_DEFINE(USE_CODEMMAP)
+ ;;
+sparc* | * )
+ AC_MSG_ERROR($host_cpu systems are not supported at this time)
+ ;;
+esac
+
+
+case "$host_os" in
+*linux* | *Linux* )
+ CFLAGS="$CFLAGS -D__LINUX__"
+ ;;
+* )
+ ;;
esac
-AC_SUBST(COMPILER_SOURCES)
AC_SUBST(COMPILER_OBJECTS)
-AC_DEFINE_UNQUOTED(SYSDEP_DIR, "$SYSDEP_DIR")
-AC_SUBST(SYSDEP_DIR)
+AC_DEFINE_UNQUOTED(ARCH_DIR, "$ARCH_DIR")
+AC_SUBST(ARCH_DIR)
dnl Checks for programs.
AC_PROG_CC
+AM_PROG_AS
AC_PROG_RANLIB
+AC_PROG_MAKE_SET
dnl Checks for libraries.
-AC_CHECK_LIB(m, sin)
+dnl AC_CHECK_LIB(m, sin)
dnl Checks for header files.
AC_HEADER_DIRENT
AC_HEADER_STDC
-AC_CHECK_HEADERS(fcntl.h sys/time.h unistd.h)
+AC_CHECK_HEADERS([fcntl.h])
+AC_CHECK_HEADERS([sys/time.h])
+AC_CHECK_HEADERS([unistd.h])
+AC_CHECK_HEADERS([sys/ioctl.h])
dnl Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST
AC_DEFINE(HAVE_MAP_FAILED)
fi
- if test $ac_cv_map_failed = yes; then
+ if test $ac_cv_map_anonymous = yes; then
AC_DEFINE(HAVE_MAP_ANONYMOUS)
fi
fi
dnl Features
dnl check arguments
-AC_ARG_ENABLE(threads, [ --enable-threads enable threads support])
-AC_ARG_ENABLE(gc2, [ --enable-gc2 enable new garbage collector])
+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])
+
dnl threads
AC_MSG_CHECKING(whether to include threads support)
AC_SUBST(THREAD_OBJ)
fi
-dnl garbage collector version
-AC_MSG_CHECKING(which garbage collector to use)
-if test x"$enable_gc2" = "xno"; then
- AC_MSG_RESULT(old garbage collector)
- GC_OBJ="mm/libmm_old.a"
+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 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(gtk-peer, [ --enable-gtk-peer enable threads support [default=no]])
+
+dnl threads
+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.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="gnuclasspathnat/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
- AC_MSG_RESULT(new garbage collector)
- GC_OBJ="mm/libmm_new.a"
+ AWT_OBJS=
+ AWTPEERS=
+ USEGTK=no
+ AC_SUBST(USEGTK)
+ AC_SUBST(AWTPEERS)
+ AC_SUBST(AWT_OBJS)
+ AC_MSG_RESULT(no)
fi
-AC_SUBST(GC_OBJ)
+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_OUTPUT(Makefile \
- toolbox/Makefile \
mm/Makefile \
+ toolbox/Makefile \
threads/Makefile \
jit/Makefile \
- alpha/Makefile \
- mips/Makefile \
+ jit/loop/Makefile \
+ jit/alpha/Makefile \
+ jit/i386/Makefile \
+ jit/mips/Makefile \
+ jit/powerpc/Makefile \
+ jit/x86_64/Makefile \
nat/Makefile \
- comp/Makefile )
+ doc/Makefile \
+ tst/Makefile \
+ tst/kaffe/Makefile \
+ jvmtst/Makefile )
+
+
+