X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=configure.in;h=5563b1b63b986aca2cc6e12c0a1e9f2c02fd5667;hb=39f1f228810acef5db6865eaa84281256754f491;hp=5fac1d13fee06f1b17edcb4c6b8e550b456f5df1;hpb=8ba2d696e70a7ae25354a1e04ea947054308344d;p=mono.git

diff --git a/configure.in b/configure.in
index 5fac1d13fee..5563b1b63b9 100644
--- a/configure.in
+++ b/configure.in
@@ -119,7 +119,8 @@ case "$host" in
 		AC_DEFINE(PTHREAD_POINTER_ID, 1, [pthread is a pointer])
 		libdl=
 		libgc_threads=pthreads
-		with_sigaltstack=yes
+		# This doesn't seem to work as of 7.0 on amd64
+		with_sigaltstack=no
 # TLS is only partially implemented on -CURRENT (compiler support
 # but NOT library support)
 #
@@ -175,6 +176,7 @@ case "$host" in
 		;;
 	*-*-darwin*)
 		platform_win32=no
+		platform_darwin=yes
 		CPPFLAGS="$CPPFLAGS -no-cpp-precomp -D_THREAD_SAFE -DGC_MACOSX_THREADS -DPLATFORM_MACOSX -DUSE_MMAP -DUSE_MUNMAP"
 		CPPFLAGS="$CPPFLAGS -DGetCurrentProcess=MonoGetCurrentProcess -DGetCurrentThread=MonoGetCurrentThread -DCreateEvent=MonoCreateEvent"
 		libmono_cflags="-D_THREAD_SAFE"
@@ -266,7 +268,7 @@ fi
 AM_CONDITIONAL(NO_VERSION_SCRIPT, test x$no_version_script = xyes)
 
 AC_CHECK_HEADERS(sys/filio.h sys/sockio.h netdb.h utime.h sys/utime.h semaphore.h sys/un.h linux/rtc.h sys/syscall.h sys/mkdev.h)
-AC_CHECK_HEADERS(sys/user.h sys/ipc.h sys/sem.h alloca.h ucontext.h)
+AC_CHECK_HEADERS(sys/user.h sys/socket.h sys/ipc.h sys/sem.h sys/utsname.h alloca.h ucontext.h pwd.h)
 
 AC_CHECK_HEADER(zlib.h, [have_zlib=yes], [have_zlib=no])
 if test x$have_zlib = xyes; then
@@ -391,6 +393,14 @@ fi
 # we do not configure the full gettext, as we consume it dynamically from C#
 AM_PO_SUBDIRS
 
+if test "x$USE_NLS" = "xyes"; then
+   AC_CHECK_PROG(HAVE_MSGFMT, msgfmt,yes,no)
+
+   if test "x$HAVE_MSGFMT" = "xno"; then
+	  AC_MSG_ERROR([msgfmt not found. You need to install the 'gettext' package, or pass --enable-nls=no to configure.])
+   fi
+fi
+
 AC_ARG_WITH([libgdiplus], 
 	[  --with-libgdiplus=installed|sibling|<path>	Override the libgdiplus used for System.Drawing tests (defaults to NO)], 
 	[], [with_libgdiplus=installed])
@@ -1748,6 +1758,8 @@ SQLITE="libsqlite.so.0"
 SQLITE3="libsqlite3.so.0"
 X11="libX11.so"
 
+sizeof_register="SIZEOF_VOID_P"
+
 jit_wanted=false
 interp_wanted=false
 case "$host" in
@@ -1761,6 +1773,20 @@ case "$host" in
 		ACCESS_UNALIGNED="no"
 		JIT_SUPPORTED=yes
 		jit_wanted=true
+
+		AC_MSG_CHECKING(for mips n32)
+		AC_TRY_COMPILE([], [
+		void main () {
+		#if _MIPS_SIM != _ABIN32
+		#error Not mips n32
+		#endif
+   		}
+		],[
+		AC_MSG_RESULT(yes)
+		sizeof_register=8
+		],[
+		AC_MSG_RESULT(no)
+		])
 		;;
 	i*86-*-*)
 		TARGET=X86;
@@ -1916,6 +1942,14 @@ case "$host" in
 		;;
 esac
 
+if test "x$sizeof_register" = "x4"; then
+   AC_DEFINE(SIZEOF_REGISTER,4,[size of machine integer registers])
+elif test "x$sizeof_register" = "x8"; then
+   AC_DEFINE(SIZEOF_REGISTER,8,[size of machine integer registers])
+else
+   AC_DEFINE(SIZEOF_REGISTER,SIZEOF_VOID_P,[size of machine integer registers])
+fi
+
 if test "x$have_visibility_hidden" = "xyes"; then
    AC_DEFINE(HAVE_VISIBILITY_HIDDEN, 1, [Support for the visibility ("hidden") attribute])
 fi
@@ -2331,6 +2365,8 @@ data/dotnet35.pc
 data/wcf.pc
 data/cecil.pc
 data/smcs.pc
+data/system.web.extensions_1.0.pc
+data/system.web.extensions.design_1.0.pc
 samples/Makefile
 support/Makefile
 data/config
@@ -2393,6 +2429,10 @@ fi
     echo "MONO_VERSION = $myver" >> $srcdir/$mcsdir/build/config.make
   fi
 
+  if test x$platform_darwin = xyes; then
+	echo "PLATFORM = darwin" >> $srcdir/$mcsdir/build/config.make
+  fi
+
   if test x$TARGET = xAMD64 -a x$platform_win32 = xno -a "x$AOT_SUPPORTED" = "xyes"; then
   	 echo "ENABLE_AOT = 1" >> $srcdir/$mcsdir/build/config.make
   fi