add escape character for underscore to codegen_resolve_native

[cacao.git] / configure.in

diff --git a/configure.in b/configure.in
index 5dc6f829dca80da9bf1bc8d09a00185f04176685..b33c2bc9d54191eb6c7a1b436c3c4e4e28eb222b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -15,6 +15,7 @@ dnl system type
 case "$host_cpu" in
 alpha* )
        ARCH_DIR="alpha"
+        STATIC_CLASSPATH="1"
        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])
@@ -22,6 +23,7 @@ alpha* )
 
 i386* | i486* | i586* | i686* )
        ARCH_DIR="i386"
+        STATIC_CLASSPATH="0"
        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])
@@ -29,6 +31,7 @@ i386* | i486* | i586* | i686* )
 
 mips* )
        ARCH_DIR="mips"
+        STATIC_CLASSPATH="1"
        CFLAGS="-64 -O2 -OPT:Olimit=0 -g -DMAP_ANONYMOUS=0 -woff 1110,1164,1515 -D__MIPS__"
        LIBS="-lelfutil"
        AC_DEFINE([TRACE_ARGS_NUM], 8, [Defines integer argument register count])
@@ -36,12 +39,14 @@ mips* )
 
 powerpc* | ppc* )
        ARCH_DIR="powerpc"
+        STATIC_CLASSPATH="1"
        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"
+        STATIC_CLASSPATH="1"
        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])
@@ -60,6 +65,9 @@ case "$host_os" in
 *darwin* )
         CFLAGS="$CFLAGS -D__DARWIN__"
         ;;
+*irix* )
+        CFLAGS="$CFLAGS -D__IRIX__"
+        ;;
 * )
        ;;
 esac
@@ -69,6 +77,20 @@ 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
@@ -137,7 +159,7 @@ dnl Features
 
 dnl check arguments
 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])
+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
@@ -236,7 +258,10 @@ 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 \
@@ -280,6 +305,7 @@ if test x"$enable_gtk_peer" = "xyes"; then
                AC_DEFINE([USE_GTK], 1, [use gtk])
 
 else
+       CACAO_GTK=no
        AWT_OBJS=""
        AWTPEERS=""
        USEGTK="no"
@@ -292,9 +318,33 @@ else
 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
+export CACAO_GTK
 AC_CONFIG_SUBDIRS(mm/boehm-gc classpath)