X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=configure.in;h=52b98875a9205a0aebed0770a7eb3a4de3697c42;hb=c55ce9b7f88c0ac1d7e163455822dbac93805062;hp=91efbd2fd13e3d307c9e1d488a9e3c5575f6e868;hpb=ca36a8e3e8d3598b8ff901ac1825494dce0b0fc4;p=mono.git

diff --git a/configure.in b/configure.in
index 91efbd2fd13..52b98875a92 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.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 ******************************************************************
@@ -329,7 +337,34 @@ if test x$platform_win32 = xno; then
 	dnl *** Checks for semaphore lib ***
 	dnl ********************************
 	AC_CHECK_LIB(rt, sem_init, LIBS="$LIBS -lrt")
+
+	dnl ********************************
+	dnl *** Checks for timezone stuff **
+	dnl ********************************
+	AC_CACHE_CHECK(for timezone variable, ac_cv_var_timezone,
+		AC_TRY_COMPILE([
+			#include <time.h>
+		], [
+			timezone = 1;
+		], ac_cv_var_timezone=yes, ac_cv_var_timezone=no))
+	if test $ac_cv_var_timezone = yes; then
+		AC_DEFINE(HAVE_TIMEZONE)
+	else
+		AC_CACHE_CHECK(for tm_gmtoff in struct tm, ac_cv_struct_tm_gmtoff,
+			AC_TRY_COMPILE([
+				#include <time.h>
+				], [
+				struct tm tm;
+				tm.tm_gmtoff = 1;
+				], ac_cv_struct_tm_gmtoff=yes, ac_cv_struct_tm_gmtoff=no))
+		if test $ac_cv_struct_tm_gmtoff = yes; then
+			AC_DEFINE(HAVE_TM_GMTOFF)
+		else
+			AC_ERROR(unable to find a way to determine timezone)
+		fi
+	fi
 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)
@@ -423,6 +458,14 @@ else
 fi
 fi
 
+AC_MSG_CHECKING([if inter-process shared handles are requested])
+AC_ARG_ENABLE(shared-handles, [  --disable-shared-handles disable inter-process shared handles], try_shared_handles=$enableval, try_shared_handles=yes)
+AC_MSG_RESULT($try_shared_handles)
+if test "x$try_shared_handles" != "xyes"; then
+	AC_DEFINE(DISABLE_SHARED_HANDLES)
+	AC_SUBST(DISABLE_SHARED_HANDLES)
+fi
+
 TARGET="unknown"
 ACCESS_UNALIGNED="yes"
 
@@ -433,7 +476,7 @@ sparc*-*-*) TARGET=SPARC; arch_target=sparc; ACCESS_UNALIGNED="no";;
 #alpha*-*-linux* | alpha*-*-osf*) TARGET=ALPHA; ACCESS_UNALIGNED="no";;
 #m68k-*-linux*) TARGET=M68K;;
 powerpc-*-linux* | powerpc-*-sysv*) TARGET=POWERPC; arch_target=ppc;;
-arm-*-linux-*) TARGET=ARM; arch_target=arm; ACCESS_UNALIGNED="no";;
+arm-*-linux-* | armv4l-*-linux-*) TARGET=ARM; arch_target=arm; ACCESS_UNALIGNED="no";;
 esac
 
 if test ${TARGET} = unknown; then
@@ -471,15 +514,17 @@ 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
 mono/io-layer/Makefile
+mono/handles/Makefile
 runtime/Makefile
 scripts/Makefile
 man/Makefile
 doc/Makefile
+docs/Makefile
 ])
 
 echo "