-dnl autoconf; autoheader; automake
+cdnl autoconf; autoheader; automake
dnl Process this file with autoconf to produce a configure script.
-AC_INIT(main.c)
+AC_INIT([main.c])
AC_CANONICAL_HOST
+AC_PREREQ(2.59)
AM_INIT_AUTOMAKE(cacao, 0.40)
-AM_CONFIG_HEADER(config.h)
+AM_CONFIG_HEADER([config.h])
AC_PREFIX_DEFAULT(/usr/local/cacao)
case "$host_cpu" in
alpha* )
ARCH_DIR="alpha"
- CFLAGS="-mieee -O2 -g3 -D__ALPHA__"
- AC_DEFINE(TRACE_ARGS_NUM, 6)
- AC_DEFINE(USE_CODEMMAP)
+ CFLAGS="-Wall -O2 -g3 -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 -O2 -g3 -D__I386__"
- AC_DEFINE(TRACE_ARGS_NUM, 8)
- AC_DEFINE(USE_CODEMMAP)
+ 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)
+ AC_DEFINE([TRACE_ARGS_NUM], 8, [Defines integer argument register count])
;;
powerpc* | ppc* )
ARCH_DIR="powerpc"
- CFLAGS="-O2 -g -DMAP_ANONYMOUS=0 -no-cpp-precomp"
- AC_DEFINE(TRACE_ARGS_NUM, 8)
+ CFLAGS="-Wall -O2 -g -DMAP_ANONYMOUS=0 -no-cpp-precomp -D__POWERPC__"
+ AC_DEFINE([TRACE_ARGS_NUM], 8, [Defines integer argument register count])
;;
x86_64* )
ARCH_DIR="x86_64"
- CFLAGS="-O2 -g3 -D__X86_64__"
- AC_DEFINE(TRACE_ARGS_NUM, 6)
- AC_DEFINE(USE_CODEMMAP)
+ CFLAGS="-Wall -O2 -g3 -D__X86_64__"
+ AC_DEFINE([TRACE_ARGS_NUM], 6, [Defines integer argument register count])
+ AC_DEFINE([USE_CODEMMAP], 1, [use code mmap])
;;
sparc* | * )
;;
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"
+ ;;
+*darwin* )
+ CFLAGS="$CFLAGS -D__DARWIN__"
+ ;;
+*irix* )
+ CFLAGS="$CFLAGS -D__IRIX__"
+ ;;
+* )
+ ;;
+esac
+
AC_SUBST(COMPILER_OBJECTS)
-AC_DEFINE_UNQUOTED(ARCH_DIR, "$ARCH_DIR")
+AC_DEFINE_UNQUOTED([ARCH_DIR], "$ARCH_DIR", [Architecture directory])
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_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
ac_cv_map_anonymous=no))
if test $ac_cv_map_failed = yes; then
- AC_DEFINE(HAVE_MAP_FAILED)
+ AC_DEFINE([HAVE_MAP_FAILED], 1, [Define if mman.h defines MAP_FAILED])
fi
if test $ac_cv_map_anonymous = yes; then
- AC_DEFINE(HAVE_MAP_ANONYMOUS)
+ AC_DEFINE([HAVE_MAP_ANONYMOUS], 1, [Define if mman.h defines MAP_ANONYMOUS])
fi
fi
dnl Features
dnl check arguments
-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])
+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)
-
- AC_DEFINE(USE_THREADS)
- AC_DEFINE(EXTERNAL_OVERFLOW)
- AC_DEFINE(DONT_FREE_FIRST)
+ 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"
AC_SUBST(LIBTHREAD)
AC_SUBST(THREAD_OBJ)
-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
fi
rm -f conftest*])
if test "$ac_cv_gcc___thread" = yes; then
- AC_DEFINE(HAVE___THREAD)
+ AC_DEFINE([HAVE___THREAD], 1, [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_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
- ZIP_LIBS=-lz
- ZIP_C=unzip.c
- AC_DEFINE(USE_ZLIB)
- AC_MSG_RESULT(yes)
-
-else
+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)
+ 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(gtkpeer, [ --enable-gtkpeer 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_gtkpeer" = "xyes"; then
+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="classpathbin/$ARCH_DIR/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"
- USEGTK=yes
+ USEGTK="yes"
AC_SUBST(USEGTK)
AC_SUBST(AWTPEERS)
AC_SUBST(AWT_OBJS)
- AC_DEFINE(USE_GTK)
+ AC_DEFINE([USE_GTK], 1, [use gtk])
else
- AWT_OBJS=
- AWTPEERS=
- USEGTK=no
+ AWT_OBJS=""
+ AWTPEERS=""
+ USEGTK="no"
AC_SUBST(USEGTK)
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 classpath)
+
+
AC_OUTPUT(Makefile \
mm/Makefile \
toolbox/Makefile \
doc/Makefile \
tst/Makefile \
tst/kaffe/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 ../..
-
-
-
+ jvmtst/Makefile )
projects / cacao.git / blobdiff