X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=configure.in;h=248763c5a0df1053c334c050ec95922e3e0d9512;hb=c68ea769ee205cc7787746dfe1b1311405b4852b;hp=43380d354cebaeef199e73ea5e31e82c616e35e5;hpb=4b541b39b1323082c79cfc9e79aabc1218ed0fc6;p=mono.git

diff --git a/configure.in b/configure.in
index 43380d354ce..248763c5a0d 100644
--- a/configure.in
+++ b/configure.in
@@ -1,9 +1,11 @@
 AC_INIT(README)
 AC_CANONICAL_SYSTEM
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(mono,0.94)
+AM_INIT_AUTOMAKE(mono,1.0)
 AM_MAINTAINER_MODE
 
+AC_PROG_LN_S
+
 dnl
 dnl libgc checks
 dnl
@@ -50,6 +52,10 @@ case "$host" in
 		libdl=
 		libgc_threads=win32
 		gc_default=boehm 
+		with_nptl=no
+		with_sigaltstack=no
+		LN_S=cp
+
 		;;
 	*-*-*netbsd*)
 		platform_win32=no
@@ -240,14 +246,15 @@ AC_SUBST(GMODULE_LIBS)
 
 AC_ARG_WITH(gc, [  --with-gc=boehm,included,none],[gc=$with_gc],[gc=$gc_default])
 
-# Enable support for NPTL only features like fast thread-local storage
-# We can't reliably detect nptl at compile & run time
-# so this option will stay until nptl becomes more widespread
-AC_ARG_WITH(nptl, [  --with-nptl=yes,no      enable/disable support for NPTL],[],[with_nptl=yes])
+# Enable support for fast thread-local storage
+# Some systems have broken support, so we allow to disable it.
+# This is misnamed: __thread support has no relation to NPTL,
+# but people already use it...
+AC_ARG_WITH(nptl, [  --with-nptl=yes,no      enable/disable support for __thread support],[],[with_nptl=yes])
 
 # Enable support for using sigaltstack for SIGSEGV and stack overflow handling
 # This does not work on some platforms (bug #55253)
-AC_ARG_WITH(sigaltstack, [  --with-sigaltstack=yes,no      enable/disable support for sigaltstack],[],[with_sigaltstack=yes])
+AC_ARG_WITH(sigaltstack, [  --with-sigaltstack=yes,no      enable/disable support for sigaltstack],[],[with_sigaltstack=no])
 
 # assembly bundle support, see metadata/make-bundle.pl for more info
 AC_ARG_WITH(bundle, [  --with-bundle=bundle_template],[
@@ -898,8 +905,37 @@ if test x$platform_win32 = xno; then
 		AC_DEFINE_UNQUOTED(SIGVAL_PTR,$SIGVAL_PTR,[Pointer field name in 'union sigval'])
 	fi
 else
+	jdk_headers_found=no
 	AC_CHECK_LIB(ws2_32, main, LIBS="$LIBS -lws2_32", AC_ERROR(bad mingw install?))
 	AC_CHECK_LIB(psapi, main, LIBS="$LIBS -lpsapi", AC_ERROR(bad mingw install?))
+
+	dnl *********************************
+	dnl *** Check for struct ip_mreqn ***
+	dnl *********************************
+	AC_MSG_CHECKING(for struct ip_mreqn)
+	AC_TRY_COMPILE([#include <ws2tcpip.h>], [
+		struct ip_mreqn mreq;
+		mreq.imr_address.s_addr = 0;
+	], [
+		# Yes, we have it...
+		AC_MSG_RESULT(yes)
+		AC_DEFINE(HAVE_STRUCT_IP_MREQN)
+	], [
+		# We'll just have to try and use struct ip_mreq
+		AC_MSG_RESULT(no)
+		AC_MSG_CHECKING(for struct ip_mreq)
+		AC_TRY_COMPILE([#include <ws2tcpip.h>], [
+			struct ip_mreq mreq;
+			mreq.imr_interface.s_addr = 0;
+		], [
+			# Yes, we have it...
+			AC_MSG_RESULT(yes)
+			AC_DEFINE(HAVE_STRUCT_IP_MREQ)
+		], [
+			# No multicast support
+			AC_MSG_RESULT(no)
+		])
+	])
 fi
 
 dnl socklen_t check
@@ -949,7 +985,7 @@ case "{$target}" in
 dnl Win32 does not have /dev/random, they have their own method...
 
     *-*-mingw*|*-*-cygwin*)
-    ac_cv_have_dev_random = no
+    ac_cv_have_dev_random=no
     ;;
 
 dnl Everywhere else, it's /dev/random
@@ -1040,6 +1076,7 @@ ACCESS_UNALIGNED="yes"
 
 JIT_SUPPORTED=no
 LIBC="libc.so.6"
+INTL="libc.so.6"
 
 jit_wanted=false
 case "$host" in
@@ -1064,12 +1101,15 @@ case "$host" in
 		JIT_SUPPORTED=yes
 		ACCESS_UNALIGNED="no"
 		LIBC="libc.so"
+		INTL="libintl.so"
 		jit_wanted=true
 		;;
-#       alpha*-*-linux* | alpha*-*-osf*)
-#		TARGET=ALPHA;
-#		ACCESS_UNALIGNED="no"
-#	       ;;
+       alpha*-*-linux* | alpha*-*-osf*)
+		TARGET=ALPHA;
+		ACCESS_UNALIGNED="no"
+		JIT_SUPPORTED=no
+		arch_target=alpha;
+	       ;;
 #	ia64-*-linux* | ia64-*-hpux*)
 #		TARGET=IA64;
 #		arch_target=ia64;
@@ -1089,6 +1129,11 @@ case "$host" in
 		LIBC="libc.sl"
 		ACCESS_UNALIGNED="no"
 		;;
+	hppa*linux*)
+		TARGET=HPPA;
+		arch_target=hppa; 
+		ACCESS_UNALIGNED="no"
+		;;
 	macppc-*-openbsd* | powerpc-*-linux* | powerpc-*-openbsd* | \
         powerpc-*-sysv* | powerpc-*-darwin*)
 		TARGET=POWERPC;
@@ -1133,6 +1178,11 @@ case "$host" in
      powerpc-*-darwin*)
 	libsuffix=".dylib"
 	LIBC="libc.dylib"
+	INTL="libintl.dylib"
+	;;
+     *-*-*netbsd*)
+	LIBC="libc.so.12"
+	INTL="libintl.so.0"
 	;;
 esac
 AC_SUBST(libsuffix)
@@ -1190,6 +1240,7 @@ AM_CONDITIONAL(HPPA, test x$TARGET = xHPPA)
 AM_CONDITIONAL(JIT_SUPPORTED, test x$JIT_SUPPORTED = xyes)
 
 AC_SUBST(LIBC)
+AC_SUBST(INTL)
 
 AC_SUBST(arch_target)
 AC_SUBST(CFLAGS)
@@ -1248,7 +1299,7 @@ echo "
 
 	GC:	     $gc
 	ICU:	     $enable_icu
-	NPTL:        $with_nptl
+	__thread:    $with_nptl
 	SIGALTSTACK: $with_sigaltstack
 	Engine:      $jit_status
 	2.0 Alpha:   $PREVIEW