fix cacao/gennativetable to not crash on zipfile input, whole classpath in cacaodev...
[cacao.git] / configure.in
index f679dd19ef39f7e1705e64041febf48b6f1e0891..1019ce830ff11f52f6f2f5cc775255f8729944f6 100644 (file)
@@ -1,11 +1,12 @@
-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)
 
@@ -14,36 +15,36 @@ dnl system type
 case "$host_cpu" in
 alpha* )
        ARCH_DIR="alpha"
-       CFLAGS="-mieee -O0 -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 -O0 -g3 -D__I386__"
-       AC_DEFINE(TRACE_ARGS_NUM, 8)
-       AC_DEFINE(USE_CODEMMAP)
+       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="-O0 -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* | * )
@@ -51,18 +52,31 @@ 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__"
+        ;;
+* )
+       ;;
+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
@@ -110,11 +124,11 @@ 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
 
@@ -122,74 +136,94 @@ fi
 dnl Features
 
 dnl check arguments
-AC_ARG_ENABLE(threads, [  --enable-threads        enable threads support [default yes]])
+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])
+
 
 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)
+       ;;
+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
 
-dnl now configure boehm gc
-AC_CONFIG_SUBDIRS(mm/boehm-gc)
+       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)
 
+               CFLAGS="$CFLAGS -D_REENTRANT"
 
-AC_ARG_WITH(classcompiler, [  --with-classcompiler[=ARG]         compiler for creating classpath  [jikes,javac13,complang] [default=javac13]])
+               dnl Tell boehm to support threads as well
+               ac_configure_args="$ac_configure_args --enable-boehm-threads=posix"
+       else
+               AC_MSG_RESULT(yes, green)
 
-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"
-       ;;
+               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_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], 1, [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_ARG_ENABLE(zlib, [  --enable-zlib           enable zip archive class storage (experimental), needs zlib [[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)
 fi
 AC_SUBST(ZIP_LIBS)
 AC_SUBST(ZIP_C)
 
 dnl check arguments
-AC_ARG_ENABLE(gtkpeer, [  --enable-gtkpeer        enable threads support [default no]])
+AC_ARG_ENABLE(gtk-peer, [  --enable-gtk-peer       enable threads support [[no]]])
 
 dnl threads
 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.peer.MenuPeer \
@@ -224,26 +258,31 @@ if test x"$enable_gtkpeer" = "xyes"; then
                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)
 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 \
@@ -259,19 +298,4 @@ AC_OUTPUT(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 )