X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=configure.in;h=f140dbc3d368e977c3187fd99f7c6077874e3a8e;hb=67e70bfd9b0dc650723849f3e4259c9fbed8ff5f;hp=60cca61dc527ae087c51cf341c6a6b5cda459f3c;hpb=664de759621d743d9d5bb60fba00439a51e78d05;p=mono.git

diff --git a/configure.in b/configure.in
index 60cca61dc52..f140dbc3d36 100644
--- 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.9)
+AM_INIT_AUTOMAKE(mono, 0.10)
 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,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
@@ -76,46 +96,36 @@ AC_SUBST(GMODULE_CFLAGS)
 AC_SUBST(GMODULE_LIBS)
 
 AC_CHECK_LIB(gc, GC_malloc, found_boehm="yes")
+gc=auto
+AC_ARG_WITH(gc, [  --with-gc=boehm,none],[gc=$with_gc])
 
-AC_ARG_WITH(gc, [  --with-gc=bohem,none],
-	if test x$with_gc = "xyes"; then
-		with_gc="boehm"
-	fi
-	if test x$with_gc = "xboehm"; then
-		if test x$found_boehm != "xyes"; then
-			AC_MSG_ERROR(Boehm gc requested but libgc could not be found.)
+case "x$gc" in
+	xboehm|xyes)
+		if test "x$found_boehm" != "xyes"; then
+			AC_MSG_ERROR("GC requested but libgc not found!")
 		fi
-	else
-    		AC_MSG_WARN("Compiling mono without GC.")
-	fi,
-	if test x$found_boehm != "xyes"; then
-    		AC_MSG_WARN("Compiling mono without GC.")
-	else
-		with_gc="none"
-	fi
-)
-if test x$with_gc = "xboehm"; then
-	AC_DEFINE(HAVE_BOEHM_GC)
-	AC_SUBST(HAVE_BOEHM_GC)
-	LIBS="$LIBS -lgc"
-    	AC_MSG_RESULT("Compiling mono with Boehm GC.")
-fi
 
-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)
+		AC_DEFINE(HAVE_BOEHM_GC)
+		AC_SUBST(HAVE_BOEHM_GC)
+		LIBS="$LIBS -lgc"
+		;;
+	xnone)
+		AC_MSG_WARN("Compiling mono without GC.")
 		;;
 	*)
-		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 ******************************************************************
@@ -455,6 +465,7 @@ AC_SUBST(CFLAGS)
 AC_OUTPUT([
 Makefile
 mono/Makefile
+mono/utils/Makefile
 mono/metadata/Makefile
 mono/dis/Makefile
 mono/cil/Makefile
@@ -465,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
@@ -474,4 +485,11 @@ runtime/Makefile
 scripts/Makefile
 man/Makefile
 doc/Makefile
+docs/Makefile
 ])
+
+echo "
+
+	GC:	$gc
+
+"