case "$host_cpu" in
alpha* )
ARCH_DIR="alpha"
- CFLAGS="-Wall -O2 -g3 -mieee -D__ALPHA__"
+ STATIC_CLASSPATH="1"
+ CFLAGS="-mieee -D__ALPHA__"
AC_DEFINE([TRACE_ARGS_NUM], 6, [Defines integer argument register count])
AC_DEFINE([USE_CODEMMAP], 1, [use code mmap])
;;
i386* | i486* | i586* | i686* )
ARCH_DIR="i386"
- CFLAGS="-Wall -O0 -g3 -D__I386__"
+ STATIC_CLASSPATH="0"
+ CFLAGS="-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__"
+ STATIC_CLASSPATH="1"
+ CFLAGS="-64 -O2 -OPT:Olimit=0 -g -woff 1110,1164,1515 -D__MIPS__"
LIBS="-lelfutil"
AC_DEFINE([TRACE_ARGS_NUM], 8, [Defines integer argument register count])
;;
powerpc* | ppc* )
ARCH_DIR="powerpc"
- CFLAGS="-Wall -O2 -g -DMAP_ANONYMOUS=0 -no-cpp-precomp -D__POWERPC__"
+ STATIC_CLASSPATH="1"
+ CFLAGS="-D__POWERPC__"
AC_DEFINE([TRACE_ARGS_NUM], 8, [Defines integer argument register count])
;;
x86_64* )
ARCH_DIR="x86_64"
- CFLAGS="-Wall -O2 -g3 -D__X86_64__"
+ STATIC_CLASSPATH="1"
+ CFLAGS="-D__X86_64__"
AC_DEFINE([TRACE_ARGS_NUM], 6, [Defines integer argument register count])
AC_DEFINE([USE_CODEMMAP], 1, [use code mmap])
;;
;;
esac
-
case "$host_os" in
*linux* | *Linux* )
- CFLAGS="$CFLAGS -D__LINUX__ -D_POSIX_C_SOURCE=199506L -D_XOPEN_SOURCE=500 -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE"
+ CFLAGS="-ansi -pedantic -Wall -Wno-long-long -O0 -g3 $CFLAGS -D__LINUX__ -D_POSIX_C_SOURCE=199506L -D_XOPEN_SOURCE=500 -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE"
;;
*darwin* )
- CFLAGS="$CFLAGS -D__DARWIN__"
+ CFLAGS="-ansi -pedantic -Wall -Wno-long-long -O0 -g3 $CFLAGS -D__DARWIN__"
+ ;;
+*irix* )
+ CFLAGS="$CFLAGS -D__IRIX__"
;;
* )
;;
esac
-AC_SUBST(COMPILER_OBJECTS)
AC_DEFINE_UNQUOTED([ARCH_DIR], "$ARCH_DIR", [Architecture directory])
AC_SUBST(ARCH_DIR)
+AC_ARG_ENABLE([dynamicclasspath], [AS_HELP_STRING(--disable-dynamicclasspath, link classpath native code static even on platforms supporting dynamic loading)], [use_dynamicclasspath=$enableval], [use_dynamicclasspath=yes])
+dnl force static classpath linking ??
+AC_MSG_CHECKING(Link classpath static)
+if test "xno" == "x$use_dynamicclasspath"; then
+ STATIC_CLASSPATH="1"
+fi
+
+if test "$STATIC_CLASSPATH" == "1"; then
+ AC_MSG_RESULT(yes)
+else
+ AC_MSG_RESULT(no)
+fi
+AC_SUBST(STATIC_CLASSPATH)
+
dnl Checks for programs.
AC_PROG_CC
AM_PROG_AS
ac_cv_map_anonymous=yes,
ac_cv_map_anonymous=no))
+ AC_CACHE_CHECK(whether MAP_ANON is defined,
+ ac_cv_map_anon,
+ AC_EGREP_CPP(yes,
+ [#include <sys/mman.h>
+ #ifdef MAP_ANON
+ yes
+ #endif],
+ ac_cv_map_anon=yes,
+ ac_cv_map_anon=no))
+
if test $ac_cv_map_failed = yes; then
- AC_DEFINE([HAVE_MAP_FAILED], 1, [Define if mman.h defines MAP_FAILED])
+ AC_DEFINE([HAVE_MAP_FAILED], 1, [Define if <sys/mman.h> defines MAP_FAILED])
fi
if test $ac_cv_map_anonymous = yes; then
- AC_DEFINE([HAVE_MAP_ANONYMOUS], 1, [Define if mman.h defines MAP_ANONYMOUS])
+ AC_DEFINE([HAVE_MAP_ANONYMOUS], 1, [Define if <sys/mman.h> defines MAP_ANONYMOUS])
+ fi
+
+ if test $ac_cv_map_anon = yes; then
+ AC_DEFINE([HAVE_MAP_ANON], 1, [Define if <sys/mman.h> defines MAP_ANON])
fi
fi
dnl Features
dnl check arguments
-AC_ARG_ENABLE(threads, [ --enable-threads enable threads support [[native]]])
-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=$enableval], [use__thread=yes])
dnl threads
case "$enable_threads" in
no | none | single)
AC_MSG_RESULT(no)
+ 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])
if test x"$enable_threads" != "xgreen"; then
AC_DEFINE([NATIVE_THREADS], 1, [use pthreads])
- THREAD_LIB=-lpthread
+ 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
- ac_configure_args="$ac_configure_args --enable-boehm-threads=posix"
+ 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
+ dnl no threads for boehm
ac_configure_args="$ac_configure_args --disable-boehm-threads"
fi
;;
;;
esac
+
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,
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=yes]])
+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" = "xno"; then
ZIP_C="unzip.c"
AC_DEFINE([USE_ZLIB], 1, [use zlib])
AC_MSG_RESULT(yes)
+ 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 [[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)
+ CACAO_GTK=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_DEFINE([USE_GTK], 1, [use gtk])
else
+ CACAO_GTK=no
AWT_OBJS=""
AWTPEERS=""
USEGTK="no"
AC_SUBST(AWTPEERS)
AC_SUBST(AWT_OBJS)
AC_MSG_RESULT(no)
+
+ ac_configure_args="$ac_configure_args --disable-gtk-peer"
fi
+
+if test "x1" == "x$STATIC_CLASSPATH"; then
+ STATIC_CLASSPATH_LIBS=" \
+ classpath/native/jni/java-io/.libs/libjavaio.a \
+ classpath/native/jni/java-nio/.libs/libjavanio.a \
+ classpath/native/jni/java-net/.libs/libjavanet.a \
+ classpath/native/jni/java-util/.libs/libjavautil.a \
+ classpath/native/jni/java-lang/.libs/libjavalang.a \
+ classpath/native/jni/java-lang/.libs/libjavalangreflect.a"
+ DYNAMIC_CLASSPATH_LIBS=""
+ AC_SUBST(STATIC_CLASSPATH_LIBS)
+ AC_SUBST(DYNAMIC_CLASSPATH_LIBS)
+ AC_DEFINE([STATIC_CLASSPATH], 1, [use classpath statically linked])
+
+else
+ DYNAMIC_CLASSPATH_LIBS="-ldl -Wl,--export-dynamic"
+ STATIC_CLASSPATH_LIBS=""
+ AC_SUBST(STATIC_CLASSPATH_LIBS)
+ AC_SUBST(DYNAMIC_CLASSPATH_LIBS)
+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)
+export CACAO_GTK
+AC_CONFIG_SUBDIRS(mm/boehm-gc classpath)
+
AC_OUTPUT(Makefile \
mm/Makefile \
projects / cacao.git / blobdiff