X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=configure.in;h=6a6f3af2f2b391a5a8c8ab59a6507b093e1a4947;hb=5e46d67dd11e98ce56abf812b8753737047a4e55;hp=aa1d8705eaca03f702c9b3b592c8cf69d4d9dec0;hpb=883d92d91a2e23ae19991481265484332dce2923;p=cacao.git

diff --git a/configure.in b/configure.in
index aa1d8705e..6a6f3af2f 100644
--- a/configure.in
+++ b/configure.in
@@ -14,46 +14,48 @@ AC_PREFIX_DEFAULT(/usr/local/cacao)
 
 dnl system type
 case "$host_cpu" in
-alpha | alphaev56 )
+alpha | alphaev56 | alphapca56 )
 	ARCH_DIR="alpha"
-        STATIC_CLASSPATH="1"
 	CFLAGS="-mieee -D__ALPHA__"
 	;;
 
+arm )
+	ARCH_DIR="arm"
+	ENABLE_STATICVM="1"
+	CFLAGS="-D__ARM__"
+	;;
+
 i386 | i486 | i586 | i686 )
 	ARCH_DIR="i386"
-        STATIC_CLASSPATH="0"
 	CFLAGS="-D__I386__ $CFLAGS"
 	;;
 
 mips )
 	ARCH_DIR="mips"
-        STATIC_CLASSPATH="1"
 
 dnl for MIPSPro Compiler
 dnl	CFLAGS="-64 -OPT:Olimit=0 -woff 1110,1164,1515 -D__MIPS__ -D__MIPSEB__"
 	CFLAGS="-64 -OPT:Olimit=0 -D__MIPS__ -D__MIPSEB__"
+dnl	CFLAGS="-D__MIPS__ -D__MIPSEB__"
 
 dnl for GCC
 dnl	CFLAGS="-mabi=64 -D__MIPS__ -D__MIPSEB__"
 dnl	LDFLAGS="-mabi=64"
 	;;
 
-powerpc | ppc )
+powerpc )
 	ARCH_DIR="powerpc"
-        STATIC_CLASSPATH="1"
 	CFLAGS="-D__POWERPC__"
 	;;
 
 x86_64 )
 	ARCH_DIR="x86_64"
-        STATIC_CLASSPATH="0"
 	CFLAGS="-D__X86_64__"
 	;;
 
 xdspcore )
 	ARCH_DIR="xdspcore"
-	STATIC_CLASSPATH="1"
+	ENABLE_STATICVM="1"
 	CFLAGS="-D__XDSPCORE__"
 	USE_SCHEDULER="1"
 	;;
@@ -69,12 +71,19 @@ CFLAGS="-O0 -g3 $CFLAGS"
 
 case "$host_os" in
 *linux* | *Linux* )
+	OS_DIR="linux"
         CFLAGS="-ansi -pedantic -Wall -Wno-long-long $CFLAGS -D__LINUX__ -D_POSIX_C_SOURCE=199506L -D_XOPEN_SOURCE=500 -D_XOPEN_SOURCE_EXTENDED -D_BSD_SOURCE"
 	;;
 *darwin* )
+	OS_DIR="darwin"
         CFLAGS="-ansi -pedantic -Wall -Wno-long-long $CFLAGS -D__DARWIN__"
         ;;
+*freebsd* )
+	OS_DIR="freebsd"
+	CFLAGS="-ansi -pedantic -Wall -Wno-long-long $CFLAGS -D__FREEBSD__ -D_XOPEN_SOURCE_EXTENDED"
+	;;
 *irix* )
+	OS_DIR="irix"
         CFLAGS="$CFLAGS -D__IRIX__"
         ;;
 * )
@@ -85,45 +94,26 @@ esac
 dnl define and substitute some architecture specific variables
 AC_DEFINE_UNQUOTED([ARCH_DIR], "${ARCH_DIR}", [Architecture directory])
 AC_SUBST(ARCH_DIR)
+AC_SUBST(OS_DIR)
 AC_SUBST(USE_SCHEDULER)
 
 
-dnl define install prefix
-if test "x$prefix" = xNONE; then
-	CACAO_INSTALL_PREFIX=$ac_default_prefix
-else
-	CACAO_INSTALL_PREFIX=$prefix
-fi
-AC_DEFINE_UNQUOTED([CACAO_INSTALL_PREFIX], "${CACAO_INSTALL_PREFIX}", [Installation prefix])
-AC_SUBST(CACAO_INSTALL_PREFIX)
-
-
-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)
-	AM_CONDITIONAL([STATIC_CLASSPATH], [true])
-else
-	AC_MSG_RESULT(no)
-	AM_CONDITIONAL([STATIC_CLASSPATH], [false])
-fi
-AC_SUBST(STATIC_CLASSPATH)
-
-
 dnl Checks for programs.
 AC_PROG_CC
 AM_PROG_AS
+AC_PROG_LD
+AC_PROG_LD_GNU
 AC_PROG_RANLIB
 AC_DISABLE_SHARED
-AC_PROG_LIBTOOL
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
 
+dnl libtool stuff
+AC_LIBTOOL_DLOPEN
+AC_LIBLTDL_CONVENIENCE
+AC_PROG_LIBTOOL
+AC_SUBST(LIBLTDL)
+
 dnl Checks for header files.
 AC_HEADER_DIRENT
 AC_HEADER_STDC
@@ -135,6 +125,7 @@ AC_CHECK_HEADERS([sys/ioctl.h])
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
 AC_C_INLINE
+AC_C_ATTRIBUTE
 AC_TYPE_OFF_T
 AC_TYPE_SIZE_T
 AC_HEADER_TIME
@@ -148,7 +139,10 @@ AC_TYPE_SIGNAL
 AC_CHECK_FUNCS(getcwd gettimeofday mkdir mktime select socket)
 
 dnl Checks for libraries.
-AC_CHECK_LIB(m, fmod)
+
+dnl Checking sizeof void *
+AC_COMPILE_CHECK_SIZEOF(void *)
+AC_C_BIGENDIAN
 
 dnl Check for mmap header anomalies (missing MAP_FAILED, etc.)
 if test $ac_cv_func_mmap_fixed_mapped = yes; then
@@ -196,10 +190,52 @@ if test $ac_cv_func_mmap_fixed_mapped = yes; then
 fi
 
 
+dnl check which ld flags are required to export symbols
+if test x"$with_gnu_ld" = "xyes"; then
+	EXPORT_SYMBOLS_FLAGS="-Wl,--export-dynamic"
+else
+	EXPORT_SYMBOLS_FLAGS=""
+fi
+AC_SUBST(EXPORT_SYMBOLS_FLAGS)
+
+
+dnl define install prefix
+if test "x$prefix" = "xNONE"; then
+	CACAO_INSTALL_PREFIX=$ac_default_prefix
+else
+	CACAO_INSTALL_PREFIX=$prefix
+fi
+AC_DEFINE_UNQUOTED([CACAO_INSTALL_PREFIX], "${CACAO_INSTALL_PREFIX}", [Installation prefix])
+AC_SUBST(CACAO_INSTALL_PREFIX)
+
+
 dnl Features
 
 dnl check arguments
 
+dnl check for garbage collector usage
+AC_ARG_ENABLE([gc], [AS_HELP_STRING(--disable-gc,disable garbage collector (for debugging only!) [[default=yes]])])
+
+AC_MSG_CHECKING(whether GC should be used)
+if test x"$enable_gc" = "xno"; then
+	AC_MSG_RESULT(no)
+	AM_CONDITIONAL([DISABLE_GC], [true])
+else
+	AC_MSG_RESULT(yes)
+	AM_CONDITIONAL([DISABLE_GC], [false])
+fi
+
+dnl check for dump memory usage
+AC_ARG_ENABLE([gc], [AS_HELP_STRING(--disable-dump,disable dump memory (for debugging only!) [[default=yes]])])
+
+AC_MSG_CHECKING(whether dump memory should be used)
+if test x"$enable_dump" = "xno"; then
+	AC_MSG_RESULT(no)
+	AC_DEFINE([DISABLE_DUMP], 1, [disable dump memory])
+else
+	AC_MSG_RESULT(yes)
+fi
+
 dnl check for statistics
 AC_ARG_ENABLE([statistics], [AS_HELP_STRING(--disable-statistics,disable statistics generation [[default=yes]])])
 
@@ -293,6 +329,20 @@ else
 fi
 
 
+dnl check for inlining
+dnl AC_ARG_ENABLE([inlining], [AS_HELP_STRING(--disable-inlining,disable method inlining [[default=yes]])])
+
+dnl AC_MSG_CHECKING(whether method inlining should be disabled)
+dnl if test x"$enable_inlining" = "xno"; then
+dnl	AC_MSG_RESULT(yes)
+dnl	AM_CONDITIONAL([USE_INLINING], [false])
+dnl else
+dnl	AC_MSG_RESULT(no)
+	AC_DEFINE([USE_INLINING], 1, [use method inlining])
+	AM_CONDITIONAL([USE_INLINING], [true])
+dnl fi
+
+
 dnl check for instruction scheduler
 AC_ARG_ENABLE([scheduler], [AS_HELP_STRING(--enable-scheduler,enable instruction scheduler [[default=no]])])
 
@@ -331,27 +381,74 @@ else
 fi
 
 
-dnl enable gtk peer
-AC_ARG_ENABLE([gtk-peer], [AS_HELP_STRING(--enable-gtk-peer,compile GTK native peers [[default=no]])])
+dnl check if CACAO should be linked statically
+AC_ARG_ENABLE([staticvm], [AS_HELP_STRING(--enable-staticvm, link GNU classpath's native libraries statically into CACAO [[default=no]])])
+
+AC_MSG_CHECKING(whether to link GNU classpath statically into CACAO)
+if test x"$enable_staticvm" = "xyes"; then
+	ENABLE_STATICVM="1"
+fi
 
-AC_MSG_CHECKING(whether to use gtk awt peers)
-if test x"$enable_gtk_peer" = "xyes"; then
+if test x"${ENABLE_STATICVM}" = "x1"; then
 	AC_MSG_RESULT(yes)
-	AC_DEFINE([USE_GTK], 1, [use gtk])
-	AM_CONDITIONAL([USE_GTK_PEER], [true])
+	AM_CONDITIONAL([ENABLE_STATICVM], [true])
 else
+	AC_MSG_RESULT(no)
+	AM_CONDITIONAL([ENABLE_STATICVM], [false])
+fi
+AC_SUBST(ENABLE_STATICVM)
+
+
+dnl check if we build gtk peers
+AC_ARG_ENABLE([gtk-peer], [AS_HELP_STRING(--disable-gtk-peer,compile GTK native peers [[default=yes]])])
+
+AC_MSG_CHECKING(whether to compile GTK awt peers)
+if test x"$enable_gtk_peer" = "xno"; then
 	AC_MSG_RESULT(no)
 	AM_CONDITIONAL([USE_GTK_PEER], [false])
 	CONFIGURE_ARGS="${CONFIGURE_ARGS} --disable-gtk-peer"
+	USE_GTK_PEER=no
+else
+	AC_MSG_RESULT(yes)
+	AC_DEFINE([USE_GTK], 1, [use gtk])
+	AM_CONDITIONAL([USE_GTK_PEER], [true])
+	USE_GTK_PEER=yes
 fi
+AC_SUBST(USE_GTK_PEER)
 
 
-if test "x$STATIC_CLASSPATH" = "x1"; then
-        AC_DEFINE([STATIC_CLASSPATH], 1, [use classpath statically linked])
-	AM_CONDITIONAL([STATIC_CLASSPATH], [true])
+dnl pass configure options to classpath
+if test x"${ENABLE_STATICVM}" = "x1"; then
+        AC_DEFINE([ENABLE_STATICVM], 1, [link CACAO statically])
+	AM_CONDITIONAL([ENABLE_STATICVM], [true])
 	CONFIGURE_ARGS="${CONFIGURE_ARGS} --enable-static --disable-shared"
+
+	dnl check for some classpath related stuff when we link statically
+	AM_ICONV_LINK
+
+	dnl taken from GNU classpath configure.ac
+	if test x"${USE_GTK_PEER}" = "xyes"; then
+		AC_ERROR(XXX this is not supported yet)
+		AC_PATH_XTRA
+		if test "$no_x" = yes; then
+			AC_MSG_ERROR([GTK+ peers requested but no X library available])
+		fi
+		dnl We explicitly want the XTest Extension for Robot support.
+		AC_CHECK_LIB([Xtst], [XTestQueryExtension], [true],
+			     [AC_MSG_ERROR([libXtst NOT found, required for GdkRobot])],
+			     [${X_LIBS}])
+		PKG_CHECK_MODULES(GTK, gtk+-2.0 >= 2.4 gthread-2.0 >= 2.2 libart-2.0 gdk-pixbuf-2.0)
+		AC_SUBST(GTK_CFLAGS)
+		AC_SUBST(GTK_LIBS)
+
+		AC_SUBST(CAIRO_LIBS)
+		AC_SUBST(CAIRO_CFLAGS)
+		PKG_CHECK_MODULES(PANGOFT2, pangoft2)
+		AC_SUBST(PANGOFT2_LIBS)
+		AC_SUBST(PANGOFT2_CFLAGS)
+	fi
 else
-	AM_CONDITIONAL([STATIC_CLASSPATH], [false])
+	AM_CONDITIONAL([ENABLE_STATICVM], [false])
 	CONFIGURE_ARGS="${CONFIGURE_ARGS} --disable-static --enable-shared"
 fi
 
@@ -384,10 +481,11 @@ ac_configure_args="$ac_configure_args --libdir=${CACAO_INSTALL_PREFIX}/jre/lib/$
 dnl now configure boehm gc and gnu classpath
 dnl the export is not my favorite (is there another way?)
 export CFLAGS
-AC_CONFIG_SUBDIRS(src/boehm-gc src/classpath)
+AC_CONFIG_SUBDIRS(src/boehm-gc src/classpath src/libltdl)
 
 
 AC_CONFIG_FILES([Makefile]
+		[contrib/Makefile]
 		[doc/Makefile]
 		[doc/handbook/Makefile]
 		[man/Makefile]
@@ -403,7 +501,8 @@ AC_CONFIG_FILES([Makefile]
 		[src/scripts/Makefile]
 		[src/scripts/cacao]
 		[src/scripts/java]
-		[src/scripts/rmic]
+		[src/scripts/javac]
+		[src/scripts/kjc]
 		[src/scripts/rmiregistry]
 		[src/threads/Makefile]
 		[src/threads/green/Makefile]
@@ -412,17 +511,22 @@ AC_CONFIG_FILES([Makefile]
 		[src/vm/Makefile]
 		[src/vm/jit/Makefile]
 		[src/vm/jit/alpha/Makefile]
+		[src/vm/jit/arm/Makefile]
 		[src/vm/jit/i386/Makefile]
+		[src/vm/jit/i386/linux/Makefile]
+		[src/vm/jit/i386/freebsd/Makefile]
 		[src/vm/jit/inline/Makefile]
 		[src/vm/jit/loop/Makefile]
 		[src/vm/jit/mips/Makefile]
 		[src/vm/jit/powerpc/Makefile]
+		[src/vm/jit/powerpc/darwin/Makefile]
+		[src/vm/jit/powerpc/linux/Makefile]
 		[src/vm/jit/schedule/Makefile]
 		[src/vm/jit/tools/Makefile]
 		[src/vm/jit/verify/Makefile]
 		[src/vm/jit/x86_64/Makefile]
 		[tests/Makefile]
-		[tests/kaffe/Makefile]
+		[tests/codepatching/Makefile]
 		[tests/native/Makefile])
 
 AC_OUTPUT