2002-04-28 Duncan Mak <duncan@ximian.com>;

[mono.git] / configure.in

diff --git a/configure.in b/configure.in
index 15b5404c9e8b573b1885d4e46a33998ec282b244..5de591cdce6064e493f9817dae360f3f2d87a479 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2,9 +2,26 @@
 AC_INIT(README)
 AC_CANONICAL_SYSTEM
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(mono, 0.10)
+AM_INIT_AUTOMAKE(mono, 0.11)
 AM_MAINTAINER_MODE
 
+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
@@ -30,13 +47,16 @@ AM_PROG_LIBTOOL
 
 AC_CHECK_HEADERS(sys/filio.h sys/sockio.h netdb.h utime.h)
 
+AC_CHECK_HEADERS(iconv.h)
+AC_CHECK_HEADERS(giconv.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 -Wpointer-arith -Wno-cast-qual -Wcast-align -Wwrite-strings'
 
 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
 if test "x$PKG_CONFIG" = "xno"; then
@@ -79,7 +99,7 @@ AC_SUBST(GMODULE_CFLAGS)
 AC_SUBST(GMODULE_LIBS)
 
 AC_CHECK_LIB(gc, GC_malloc, found_boehm="yes")
-gc=none
+gc=auto
 AC_ARG_WITH(gc, [  --with-gc=boehm,none],[gc=$with_gc])
 
 case "x$gc" in
@@ -92,35 +112,23 @@ case "x$gc" in
                AC_SUBST(HAVE_BOEHM_GC)
                LIBS="$LIBS -lgc"
                ;;
-       *)
-dnl When the JIT works with libgc, use this chunk.
-dnl            # If libgc was found, use it.  Otherwise just warn.
-dnl            if test "x$found_boehm" != "xyes"; then
-dnl                    AC_MSG_WARN("Compiling mono without GC.")
-dnl            else
-dnl                    AC_DEFINE(HAVE_BOEHM_GC)
-dnl                    AC_SUBST(HAVE_BOEHM_GC)
-dnl                    LIBS="$LIBS -lgc"
-dnl            fi
+       xnone)
                AC_MSG_WARN("Compiling mono without GC.")
                ;;
-esac
-
-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 ******************************************************************
@@ -330,6 +338,7 @@ if test x$platform_win32 = xno; then
        dnl ********************************
        AC_CHECK_LIB(rt, sem_init, LIBS="$LIBS -lrt")
 else
+       AM_CONDITIONAL(THREADS_PTHREAD, false)
        # This is a kludge, we really ought to test for libws2_32, but
        # I can't make AC_CHECK_LIB link (the symbols seem to be mangled
        # with @num suffixes)
@@ -460,6 +469,7 @@ AC_SUBST(CFLAGS)
 AC_OUTPUT([
 Makefile
 mono/Makefile
+mono/utils/Makefile
 mono/metadata/Makefile
 mono/dis/Makefile
 mono/cil/Makefile
@@ -470,7 +480,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
@@ -479,10 +489,11 @@ runtime/Makefile
 scripts/Makefile
 man/Makefile
 doc/Makefile
+docs/Makefile
 ])
 
 echo "
 
        GC:     $gc
 
-"
\ No newline at end of file
+"