X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=configure.in;h=e721806cbbd203ef7d23ceed3936bbb21e649d2c;hb=21c0d114d0a5c98c0f2e3880b812d7ab35842d46;hp=915c96e4108788f8a52b2cf5e762e1a7102b538d;hpb=1cf10953e61d06c2d5199169b658830d231ad014;p=mono.git

diff --git a/configure.in b/configure.in
index 915c96e4108..e721806cbbd 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 AC_INIT(README)
 AC_CANONICAL_SYSTEM
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(mono,1.0)
+AM_INIT_AUTOMAKE(mono,1.1.1)
 AM_MAINTAINER_MODE
 
 AC_PROG_LN_S
@@ -42,7 +42,7 @@ case "$host" in
 	*-*-mingw*|*-*-cygwin*)
 		platform_win32=yes
 		AC_DEFINE(PLATFORM_WIN32,1,[Platform is Win32])
-		CC="gcc -mno-cygwin"
+		CC="gcc -mno-cygwin -g"
 		HOST_CC="gcc"
 		# So libgc configure gets -mno-cygwin
 		export CC
@@ -51,8 +51,8 @@ case "$host" in
 		CPPFLAGS="$CPPFLAGS -DWIN32_THREADS"
 		libdl=
 		libgc_threads=win32
-		gc_default=boehm 
-		with_nptl=no
+		gc_default=included
+		with_nptl=default
 		with_sigaltstack=no
 		LN_S=cp
 
@@ -330,6 +330,7 @@ AM_CONDITIONAL(WITH_BUNDLE, test x$with_bundle != xno)
 
 LIBGC_CFLAGS=
 LIBGC_LIBS=
+LIBGC_STATIC_LIBS=
 libgc_dir=
 case "x$gc" in
 	xboehm|xbohem|xyes)
@@ -346,6 +347,7 @@ case "x$gc" in
 		AC_DEFINE(HAVE_BOEHM_GC)
 		AC_SUBST(HAVE_BOEHM_GC)
 		LIBGC_LIBS="-lgc $libdl"
+		LIBGC_STATIC_LIBS="$LIBGC_LIBS"
 
 		# AC_CHECK_FUNCS does not work for some reason...
 		AC_CHECK_LIB(gc, GC_gcj_malloc, found_gcj_malloc="yes",,$libdl)
@@ -368,6 +370,7 @@ case "x$gc" in
 
 		LIBGC_CFLAGS='-I$(top_srcdir)/libgc/include'
 		LIBGC_LIBS='$(top_builddir)/libgc/libmonogc.la'
+		LIBGC_STATIC_LIBS='$(top_builddir)/libgc/libmonogc-static.la'
 
 		AC_DEFINE(HAVE_BOEHM_GC)
 		AC_SUBST(HAVE_BOEHM_GC)
@@ -395,6 +398,7 @@ ac_configure_args="$ac_configure_args --disable-embed-check --with-libgc-threads
 AM_CONDITIONAL(INCLUDED_LIBGC, test x$use_included_gc = xyes)
 AC_SUBST(LIBGC_CFLAGS)
 AC_SUBST(LIBGC_LIBS)
+AC_SUBST(LIBGC_STATIC_LIBS)
 AC_SUBST(libgc_dir)
 
 dnl
@@ -463,6 +467,7 @@ if test x$platform_win32 = xno; then
 	AC_CHECK_FUNCS(getpwuid_r)
 	AC_CHECK_FUNCS(getresuid)
 	AC_CHECK_FUNCS(setresuid)
+	AC_CHECK_FUNCS(kqueue)
 
 	dnl ******************************************************************
 	dnl *** Check for large file support                               ***
@@ -770,9 +775,9 @@ if test x$platform_win32 = xno; then
 			}
 		], [
 				AC_MSG_RESULT(yes)
-				AC_DEFINE(HAVE_KW_THREAD)
 		], [
 				AC_MSG_RESULT(no)
+				with_tls=pthread
 		])
 	fi
 
@@ -1027,6 +1032,18 @@ ac_cv_c_socklen_t=yes
 	AC_MSG_RESULT(no)
 ])
 
+AC_MSG_CHECKING(for array element initalizer support)
+AC_TRY_COMPILE([#include <sys/socket.h>], [
+	const int array[] = {[1] = 2,};
+], [
+	# Yes, we have it...
+	AC_MSG_RESULT(yes)
+	AC_DEFINE(HAVE_ARRAY_ELEM_INIT,1,[Supports C99 array initialization])
+], [
+	# We'll have to use signals
+	AC_MSG_RESULT(no)
+])
+
 AC_CHECK_FUNCS(trunc, , AC_MSG_CHECKING(for trunc in math.h)
 	# Simply calling trunc (0.0) is no good since gcc will optimize the call away
 	AC_TRY_LINK([#include <math.h>], 
@@ -1270,15 +1287,48 @@ case "$host" in
 	LIBC="libc.so.12"
 	INTL="libintl.so.0"
 	;;
+    *-*-*freebsd*)
+    	LIBC="libc.so"
+	INTL="libintl.so"
+	;;
+    *-*-*openbsd*)
+    	LIBC="libc.so"
+	INTL="libintl.so"
+	;;
 esac
 AC_SUBST(libsuffix)
 
 if test "x$TARGET" != "xAMD64"; then
    # valgrind headers don't compile under x86-64
-   echo "A: $TARGET"
    AC_CHECK_HEADERS(valgrind/memcheck.h)
 fi
 
+if test "x$TARGET" = "xAMD64" -o "x$TARGET" = "xX86"; then
+	if test "x$with_tls" = "x__thread"; then
+		#
+		# On some linux distributions, TLS works in executables, but linking 
+		# against a shared library containing TLS fails with:
+		# undefined reference to `__tls_get_addr'
+		#
+		rm -f conftest.c conftest.so conftest
+		echo "static __thread int foo; void main () { foo = 5; }" > conftest.c
+		gcc -fPIC --shared -o conftest.so conftest.c > /dev/null 2>&1
+		gcc -o conftest conftest.so > /dev/null 2>&1
+		if test ! -f conftest; then
+		   AC_MSG_WARN([Disabling usage of __thread.]);
+		   with_tls=pthread
+		fi
+		rm -f conftest.c conftest.so conftest
+	fi
+fi
+
+if test "x$with_tls" = "x__thread"; then
+	AC_DEFINE(HAVE_KW_THREAD)
+   # Pass the information to libgc
+	CPPFLAGS="$CPPFLAGS -DUSE_COMPILER_TLS"
+	export CPPFLAGS
+fi
+
 if test ${TARGET} = ARM; then
 	dnl ******************************************
 	dnl *** Check to see what FPU is available ***