Some info for runtime hackers that need to implement internal calls.

[mono.git] / configure.in

diff --git a/configure.in b/configure.in
index 18376f214ccf463b7bd74fc03a299b5bb5699326..f140dbc3d368e977c3187fd99f7c6077874e3a8e 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -5,7 +5,23 @@ AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE(mono, 0.10)
 AM_MAINTAINER_MODE
 
-AC_CONFIG_SUBDIRS(libgc)
+dnl ****************************************
+dnl *** Check if we're building on win32 ***
+dnl ****************************************
+AC_MSG_CHECKING([if building for some Win32 platform])
+case "$host" in
+       *-*-mingw*|*-*-cygwin*)
+               platform_win32=yes
+               AC_DEFINE(PLATFORM_WIN32)
+               CC="gcc -mno-cygwin"
+               ;;
+       *)
+               platform_win32=no
+               ;;
+esac
+AC_MSG_RESULT($platform_win32)
+AM_CONDITIONAL(PLATFORM_WIN32, test x$platform_win32 = xyes)
+
 AC_CHECK_TOOL(CC, gcc, gcc)
 AC_PROG_CC
 AM_PROG_CC_STDC
@@ -31,10 +47,13 @@ AM_PROG_LIBTOOL
 
 AC_CHECK_HEADERS(sys/filio.h sys/sockio.h netdb.h utime.h)
 
+# for mono/metadata/debug-symfile.c
+AC_CHECK_HEADERS(elf.h)
+
 # not 64 bit clean in cross-compile
 AC_CHECK_SIZEOF(void *, 4)
 
-CFLAGS='-g -Wall -Wunused -Wmissing-prototypes -Wmissing-declarations'
+CFLAGS='-g -Wall -Wunused -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes  -Wmissing-prototypes -Wnested-externs  -Wshadow -Wpointer-arith -Wno-cast-qual -Wcast-align -Wwrite-strings'
 
 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
 if test "x$PKG_CONFIG" = "xno"; then
@@ -77,57 +96,36 @@ AC_SUBST(GMODULE_CFLAGS)
 AC_SUBST(GMODULE_LIBS)
 
 AC_CHECK_LIB(gc, GC_malloc, found_boehm="yes")
-gc=none
-build_own_boehm=false
+gc=auto
 AC_ARG_WITH(gc, [  --with-gc=boehm,none],[gc=$with_gc])
 
-#
-# Remove the following 3 lines when we can ship the bundled version
-#
-if test "x$found_boehm" != "xyes"; then
-       gc=none
-fi
-
 case "x$gc" in
        xboehm|xyes)
                if test "x$found_boehm" != "xyes"; then
-                       build_own_boehm=true
+                       AC_MSG_ERROR("GC requested but libgc not found!")
                fi
+
                AC_DEFINE(HAVE_BOEHM_GC)
                AC_SUBST(HAVE_BOEHM_GC)
-               if $build_own_boehm; then
-                       AC_MSG_RESULT("   using included copy")
-                       CFLAGS="$CFLAGS -I\$(top_builddir)/libgc"
-                       (mkdir libgc >& /dev/null; mkdir libgc/gc >& /dev/null; 
-                       cp $srcdir/libgc/include/*.h libgc/gc;
-                       true)
-                       LIBS="$LIBS -L`pwd`/libgc"
-               else
-                       LIBS="$LIBS -lgc"
-               fi
+               LIBS="$LIBS -lgc"
                ;;
-       *)
+       xnone)
                AC_MSG_WARN("Compiling mono without GC.")
                ;;
-esac
-
-AM_CONDITIONAL(USE_INCLUDED_BOEHM, $build_own_boehm)
-
-dnl ****************************************
-dnl *** Check if we're building on win32 ***
-dnl ****************************************
-AC_MSG_CHECKING([if building for some Win32 platform])
-case "$host" in
-       *-*-mingw*|*-*-cygwin*)
-               platform_win32=yes
-               AC_DEFINE(PLATFORM_WIN32)
-               ;;
        *)
-               platform_win32=no
+dnl When the JIT works with libgc, use this chunk.
+dnl            # If libgc was found, use it.  Otherwise just warn.
+               if test "x$found_boehm" != "xyes"; then
+                       AC_MSG_WARN("Compiling mono without GC.")
+               else
+                       AC_DEFINE(HAVE_BOEHM_GC)
+                       AC_SUBST(HAVE_BOEHM_GC)
+                       LIBS="$LIBS -lgc"
+                       gc="boehm"
+               fi
+dnl            AC_MSG_WARN("Compiling mono without GC.")
                ;;
 esac
-AC_MSG_RESULT($platform_win32)
-AM_CONDITIONAL(PLATFORM_WIN32, test x$platform_win32 = xyes)
 
 if test x$platform_win32 = xno; then
        dnl ******************************************************************
@@ -467,6 +465,7 @@ AC_SUBST(CFLAGS)
 AC_OUTPUT([
 Makefile
 mono/Makefile
+mono/utils/Makefile
 mono/metadata/Makefile
 mono/dis/Makefile
 mono/cil/Makefile
@@ -477,7 +476,7 @@ mono/arch/sparc/Makefile
 mono/arch/arm/Makefile
 mono/interpreter/Makefile
 mono/tests/Makefile
-mono/wrapper/Makefile
+mono/benchmark/Makefile
 mono/monoburg/Makefile
 mono/monograph/Makefile
 mono/jit/Makefile
@@ -486,10 +485,11 @@ runtime/Makefile
 scripts/Makefile
 man/Makefile
 doc/Makefile
+docs/Makefile
 ])
 
 echo "
 
-       GC:     $with_gc
+       GC:     $gc
 
-"
\ No newline at end of file
+"