X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=configure.in;h=18d7368c9ec3d49abaaf3e2d2700e015f2f00971;hb=07b794312558ee1c17574903e213192ded89d79a;hp=dcf3b3e93e83a82bf6ab83615713425e92c09dc3;hpb=356f13e5b5dd6f5bf02fb988491fefcf3d2a09dd;p=mono.git

diff --git a/configure.in b/configure.in
index dcf3b3e93e8..18d7368c9ec 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, 0.15)
+AM_INIT_AUTOMAKE(mono, 0.16)
 AM_MAINTAINER_MODE
 
 # Thread configuration inspired by sleepycat's db
@@ -12,22 +12,26 @@ case "$host" in
 		AC_DEFINE(PLATFORM_WIN32)
 		CC="gcc -mno-cygwin"
 		HOST_CC="gcc"
+		CPPFLAGS="$CPPFLAGS -DGC_WIN32_THREADS"
 		libdl=
 		;;
 	*-*-*bsd*)
 		platform_win32=no
 		CPPFLAGS="$CPPFLAGS -D_THREAD_SAFE"
 		LDFLAGS="$LDFLAGS -pthread"
+		AC_DEFINE(NEED_LINK_UNLINK)
+		AC_DEFINE(PTHREAD_POINTER_ID)
 		libdl=
 		;;
 	*-*-linux*)
 		platform_win32=no
-		CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE -D_REENTRANT"
+		CPPFLAGS="$CPPFLAGS -DGC_LINUX_THREADS -D_GNU_SOURCE -D_REENTRANT"
 		libdl="-ldl"
 		;;
 	*-*-solaris*)
 		platform_win32=no
-		CPPFLAGS="$CPPFLAGS -D_REENTRANT"
+		CPPFLAGS="$CPPFLAGS -DGC_SOLARIS_THREADS -DGC_SOLARIS_PTHREADS -D_REENTRANT"
+		AC_DEFINE(NEED_LINK_UNLINK)
 		;;
 	*)
 		AC_MSG_WARN([*** Please add $host to configure.in checks!])
@@ -67,7 +71,7 @@ AC_HEADER_STDC
 AC_LIBTOOL_WIN32_DLL
 AM_PROG_LIBTOOL
 
-AC_CHECK_HEADERS(sys/filio.h sys/sockio.h netdb.h utime.h)
+AC_CHECK_HEADERS(sys/filio.h sys/sockio.h netdb.h utime.h semaphore.h)
 
 # for mono/metadata/debug-symfile.c
 AC_CHECK_HEADERS(elf.h)
@@ -126,7 +130,7 @@ gc=auto
 AC_ARG_WITH(gc, [  --with-gc=boehm,none],[gc=$with_gc])
 
 case "x$gc" in
-	xboehm|xyes)
+	xboehm|xbohem|xyes)
 		if test "x$found_boehm" != "xyes"; then
 			AC_MSG_ERROR("GC requested but libgc not found!")
 		fi
@@ -310,6 +314,28 @@ if test x$platform_win32 = xno; then
 	AC_MSG_RESULT($cv_mono_sizeof_sunpath)
 	AC_DEFINE_UNQUOTED(MONO_SIZEOF_SUNPATH, $cv_mono_sizeof_sunpath)
 
+	dnl *****************************
+	dnl *** Checks for libxnet    ***
+	dnl *****************************
+	case "${host}" in
+		*solaris* )
+			AC_MSG_CHECKING(for Solaris XPG4 support)
+			if test -f /usr/lib/libxnet.so; then
+				CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=500"
+	    			CPPFLAGS="$CPPFLAGS -D__EXTENSIONS__"
+				CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED=1"
+           			LIBS="$LIBS -lxnet"
+  	    			AC_MSG_RESULT(yes)
+			else
+  	    			AC_MSG_RESULT(no)
+			fi
+
+			if test "$GCC" = "yes"; then
+		    		CFLAGS="$CFLAGS -Wno-char-subscripts"
+			fi
+    		;;
+	esac
+
 	dnl *****************************
 	dnl *** Checks for libpthread ***
 	dnl *****************************
@@ -359,6 +385,7 @@ if test x$platform_win32 = xno; then
 	fi
 else
 	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?))
 fi
 
 dnl ****************************
@@ -445,6 +472,7 @@ sparc*-*-*) TARGET=SPARC; arch_target=sparc; ACCESS_UNALIGNED="no";;
 #m68k-*-linux*) TARGET=M68K;;
 macppc-*-openbsd* | powerpc-*-linux* | powerpc-*-openbsd* | powerpc-*-sysv*) TARGET=POWERPC; arch_target=ppc;;
 arm-*-linux-* | armv4l-*-linux-*) TARGET=ARM; arch_target=arm; ACCESS_UNALIGNED="no";;
+s390-*-linux*) TARGET=S390; arch_target=s390; ACCESS_UNALIGNED="no";;
 esac
 
 if test ${TARGET} = unknown; then
@@ -464,6 +492,7 @@ AM_CONDITIONAL(ALPHA, test x$TARGET = xALPHA)
 AM_CONDITIONAL(M68K, test x$TARGET = xM68K)
 AM_CONDITIONAL(POWERPC, test x$TARGET = xPOWERPC)
 AM_CONDITIONAL(ARM, test x$TARGET = xARM)
+AM_CONDITIONAL(S390, test x$TARGET = xS390)
 
 LIBC="libc.so.6"
 AC_SUBST(LIBC)
@@ -487,6 +516,7 @@ mono/os/unix/Makefile
 mono/arch/x86/Makefile
 mono/arch/ppc/Makefile
 mono/arch/sparc/Makefile
+mono/arch/s390/Makefile
 mono/arch/arm/Makefile
 mono/interpreter/Makefile
 mono/tests/Makefile