X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=configure.in;h=66bcacc9596c0299f156a8aaa2d11f8ac446d4c9;hb=6b371eb08af0397ff7b1bd9325621e6b987c8d4f;hp=64395dd9b3915312cc9adf47deccb87f9ce8c13b;hpb=2448e22fd76130f608fecd376c7a5510b87f498e;p=mono.git

diff --git a/configure.in b/configure.in
index 64395dd9b39..66bcacc9596 100644
--- a/configure.in
+++ b/configure.in
@@ -6,7 +6,7 @@ AC_CANONICAL_SYSTEM
 m4_ifdef([_A][M_PROG_TAR],[_A][M_SET_OPTION([tar-ustar])])
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(mono,1.1.4)
+AM_INIT_AUTOMAKE(mono,1.1.5)
 AM_MAINTAINER_MODE
 
 AC_PROG_LN_S
@@ -1250,7 +1250,7 @@ fi
 #
 ICU_CFLAGS=""
 ICU_LIBS=""
-enable_icu="no;  default"
+enable_glob="normal;  default"
 
 probe_icu=false
 AC_ARG_WITH(icu, [  --with-icu=yes/no],
@@ -1266,10 +1266,9 @@ AC_ARG_WITH(icu, [  --with-icu=yes/no],
 if $probe_icu; then
 	AC_PATH_PROG(ICU_CONFIG, icu-config, no)
 	if test "x$ICU_CONFIG" = "xno" -o ! -x "$ICU_CONFIG"; then
-		AC_MSG_WARN([Only invariant locale available; install ICU for I18N support])
-		enable_icu="no, if you want full i18n support download it from: http://oss.software.ibm.com/icu/index.html"
+		enable_glob="ICU not found, using non-ICU globalization code."
 	else
-		enable_icu="yes. Version: `$ICU_CONFIG --version`"
+		enable_glob="ICU, unsupported. Version: `$ICU_CONFIG --version`"
 		AC_DEFINE(HAVE_ICU)
 		ICU_CFLAGS=`$ICU_CONFIG --cppflags`
 		ICU_LIBS=`$ICU_CONFIG --ldflags`
@@ -1332,6 +1331,9 @@ case "$host" in
 		interp_wanted=true
 		arch_target=alpha;
 	       ;;
+	*-*-mingw*|*-*-cygwin*)
+		INTL="intl"
+		;;
 #	ia64-*-linux* | ia64-*-hpux*)
 #		TARGET=IA64;
 #		arch_target=ia64;
@@ -1481,6 +1483,14 @@ if test "x$with_tls" = "x__thread"; then
    # Pass the information to libgc
 	CPPFLAGS="$CPPFLAGS -DUSE_COMPILER_TLS"
 	export CPPFLAGS
+	AC_MSG_CHECKING(if the tls_model attribute is supported)
+	AC_TRY_COMPILE([static __thread int foo __attribute__((tls_model("initial-exec")));], [
+		], [
+			AC_MSG_RESULT(yes)
+			AC_DEFINE(HAVE_TLS_MODEL_ATTR, 1, [tld_model available])
+		], [
+			AC_MSG_RESULT(no)
+	])
 fi
 
 if test ${TARGET} = ARM; then
@@ -1653,14 +1663,16 @@ runtime/Makefile
   NONE | '${prefix}') exec_prefix=$prefix ;;
   esac
 
-  echo "prefix=$exec_prefix" > $srcdir/$mcsdir/build/config.make
+  echo "prefix=$prefix" > $srcdir/$mcsdir/build/config.make
+  echo "exec_prefix=$exec_prefix" >> $srcdir/$mcsdir/build/config.make
+  echo "libdir=$libdir" >> $srcdir/$mcsdir/build/config.make
   echo 'MCS_FLAGS = $(PLATFORM_DEBUG_FLAGS)' >> $srcdir/$mcsdir/build/config.make
 )
 
 echo "
         mcs source:  $mcs_topdir
 	GC:	     $gc
-	ICU:	     $enable_icu
+	Globalization:     $enable_glob
 	TLS:         $with_tls
 	SIGALTSTACK: $with_sigaltstack
 	Engine:      $jit_status