X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=configure.in;h=18d7368c9ec3d49abaaf3e2d2700e015f2f00971;hb=48455fcb1ca6083b66aa8cd72745503aaafca0ec;hp=dd382112ce761d851ffd0f5d474f933682b88b82;hpb=e4cdfa72bb3a5f27aff221564d0e40524c3a903f;p=mono.git

diff --git a/configure.in b/configure.in
index dd382112ce7..18d7368c9ec 100644
--- a/configure.in
+++ b/configure.in
@@ -1,15 +1,58 @@
-
 AC_INIT(README)
 AC_CANONICAL_SYSTEM
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(mono, 0.8)
+AM_INIT_AUTOMAKE(mono, 0.16)
 AM_MAINTAINER_MODE
 
+# Thread configuration inspired by sleepycat's db
+AC_MSG_CHECKING([host platform characteristics])
+case "$host" in
+	*-*-mingw*|*-*-cygwin*)
+		platform_win32=yes
+		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 -DGC_LINUX_THREADS -D_GNU_SOURCE -D_REENTRANT"
+		libdl="-ldl"
+		;;
+	*-*-solaris*)
+		platform_win32=no
+		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!])
+		platform_win32=no
+		libdl="-ldl"
+		;;
+esac
+AC_MSG_RESULT(ok)
+AM_CONDITIONAL(PLATFORM_WIN32, test x$platform_win32 = xyes)
+
 AC_CHECK_TOOL(CC, gcc, gcc)
 AC_PROG_CC
 AM_PROG_CC_STDC
 AC_PROG_INSTALL
 
+AC_CHECK_PROG(BISON, bison,yes,no)
+if test "x$BISON" = "xno";
+then
+	AC_MSG_ERROR([You need to install bison])
+fi
+
 dnl may require a specific autoconf version
 dnl AC_PROG_CC_FOR_BUILD
 dnl CC_FOR_BUILD not automatically detected
@@ -28,12 +71,18 @@ AC_HEADER_STDC
 AC_LIBTOOL_WIN32_DLL
 AM_PROG_LIBTOOL
 
-AC_CHECK_HEADERS(sys/filio.h sys/sockio.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)
+
+# for mono/dis
+AC_CHECK_HEADERS(wchar.h)
 
 # not 64 bit clean in cross-compile
 AC_CHECK_SIZEOF(void *, 4)
 
-CFLAGS='-g -Wall -Wunused -Wmissing-prototypes -Wmissing-declarations'
+CFLAGS='-g -Wall -Wunused -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes  -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wno-cast-qual -Wcast-align -Wwrite-strings'
 
 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
 if test "x$PKG_CONFIG" = "xno"; then
@@ -75,38 +124,36 @@ AC_SUBST(GLIB_LIBS)
 AC_SUBST(GMODULE_CFLAGS)
 AC_SUBST(GMODULE_LIBS)
 
-dnl ****************************************
-dnl *** Check if we're building on win32 ***
-dnl ****************************************
-AC_MSG_CHECKING([if building for some Win32 platform])
-case "$host" in
-	*-*-mingw*|*-*-cygwin*)
-		platform_win32=yes
-		AC_DEFINE(PLATFORM_WIN32)
+AC_CHECK_HEADERS(gc.h gc/gc.h)
+AC_CHECK_LIB(gc, GC_malloc, found_boehm="yes",,$libdl)
+gc=auto
+AC_ARG_WITH(gc, [  --with-gc=boehm,none],[gc=$with_gc])
+
+case "x$gc" in
+	xboehm|xbohem|xyes)
+		if test "x$found_boehm" != "xyes"; then
+			AC_MSG_ERROR("GC requested but libgc not found!")
+		fi
+
+		AC_DEFINE(HAVE_BOEHM_GC)
+		AC_SUBST(HAVE_BOEHM_GC)
+		LIBS="$LIBS -lgc $libdl"
+		;;
+	xnone)
+		AC_MSG_WARN("Compiling mono without GC.")
 		;;
 	*)
-		platform_win32=no
+		# If libgc was found, use it.  Otherwise just warn.
+		if test "x$found_boehm" != "xyes"; then
+			AC_MSG_WARN("Compiling mono without GC.")
+		else
+			AC_DEFINE(HAVE_BOEHM_GC)
+			AC_SUBST(HAVE_BOEHM_GC)
+			LIBS="$LIBS -lgc $libdl"
+			gc="boehm"
+		fi
 		;;
 esac
-AC_MSG_RESULT($platform_win32)
-AM_CONDITIONAL(PLATFORM_WIN32, test x$platform_win32 = xyes)
-
-if test x$platform_win32 = xyes; then
-	AC_MSG_CHECKING([if building for native Win32])
-	case "$host" in
-		*-*-mingw*)
-			platform_win32_native=yes
-			AC_DEFINE(PLATFORM_WIN32_NATIVE)
-			;;
-		*)
-			platform_win32_native=no
-			;;
-	esac
-	AC_MSG_RESULT($platform_win32_native)
-	AM_CONDITIONAL(PLATFORM_WIN32_NATIVE,
-		       test x$platform_win32_native = xyes)
-fi
-
 
 if test x$platform_win32 = xno; then
 	dnl ******************************************************************
@@ -116,7 +163,7 @@ if test x$platform_win32 = xno; then
 	
 	# Check that off_t can represent 2**63 - 1 correctly, working around
 	# potential compiler bugs.  Defines LARGE_FILE_SUPPORT, adds $1 to
-	# CFLAGS and sets $large_offt to yes if the test succeeds
+	# CPPFLAGS and sets $large_offt to yes if the test succeeds
 	large_offt=no
 	AC_DEFUN(LARGE_FILES, [
 		large_CPPFLAGS=$CPPFLAGS
@@ -138,7 +185,7 @@ if test x$platform_win32 = xno; then
 		], [
 			AC_MSG_RESULT(ok)
 			AC_DEFINE(HAVE_LARGE_FILE_SUPPORT)
-			CFLAGS="$CFLAGS $1"
+			large_CPPFLAGS="$large_CPPFLAGS $1"
 			large_offt=yes
 		], [
 			AC_MSG_RESULT(no)
@@ -161,6 +208,21 @@ if test x$platform_win32 = xno; then
 	dnl *****************************
 	AC_CHECK_LIB(socket, socket, LIBS="$LIBS -lsocket")
 
+	dnl *******************************
+	dnl *** Checks for MSG_NOSIGNAL ***
+	dnl *******************************
+	AC_MSG_CHECKING(for MSG_NOSIGNAL)
+	AC_TRY_COMPILE([#include <sys/socket.h>], [
+		int f = MSG_NOSIGNAL;
+	], [
+		# Yes, we have it...
+		AC_MSG_RESULT(yes)
+		AC_DEFINE(HAVE_MSG_NOSIGNAL)
+	], [
+		# We'll have to use signals
+		AC_MSG_RESULT(no)
+	])
+
 	dnl *****************************
 	dnl *** Checks for SOL_IP     ***
 	dnl *****************************
@@ -205,34 +267,6 @@ if test x$platform_win32 = xno; then
 		AC_MSG_RESULT(no)
 	])
 
-	dnl ************************************
-	dnl *** Checks for IP_ADD_MEMBERSHIP ***
-	dnl ************************************
-	AC_MSG_CHECKING(for IP_ADD_MEMBERSHIP)
-	AC_TRY_COMPILE([#include <netdb.h>], [
-		int level = IP_ADD_MEMBERSHIP;
-	], [
-		# Yes, we have it...
-		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE_IP_ADD_MEMBERSHIP)
-	], [
-		AC_MSG_RESULT(no)
-	])
-
-	dnl *************************************
-	dnl *** Checks for IP_DROP_MEMBERSHIP ***
-	dnl *************************************
-	AC_MSG_CHECKING(for IP_DROP_MEMBERSHIP)
-	AC_TRY_COMPILE([#include <netdb.h>], [
-		int level = IP_DROP_MEMBERSHIP;
-	], [
-		# Yes, we have it...
-		AC_MSG_RESULT(yes)
-		AC_DEFINE(HAVE_IP_DROP_MEMBERSHIP)
-	], [
-		AC_MSG_RESULT(no)
-	])
-
 	dnl *********************************
 	dnl *** Check for struct ip_mreqn ***
 	dnl *********************************
@@ -256,114 +290,175 @@ if test x$platform_win32 = xno; then
 
 	AC_CHECK_FUNCS(inet_pton inet_aton)
 
+	dnl ***********************************************
+	dnl *** Checks for size of sockaddr_un.sun_path ***
+	dnl ***********************************************
+	# AC_CHECK_SIZEOF can't cope with struct members :-(
+	AC_MSG_CHECKING(size of sockaddr_un.sun_path)
+	AC_CACHE_VAL(cv_mono_sizeof_sunpath,
+		[AC_TRY_RUN([
+			#include <sys/types.h>
+			#include <stdio.h>
+			#include <sys/un.h>
+
+			int main(void) {
+				struct sockaddr_un sock_un;
+				FILE *f=fopen("conftestval", "w");
+				if(!f) exit(1);
+				fprintf(f, "%d\n", sizeof(sock_un.sun_path));
+				exit(0);
+			}
+		], cv_mono_sizeof_sunpath=`cat conftestval`,
+		   cv_mono_sizeof_sunpath=0,
+		   cv_mono_sizeof_sunpath=0)])dnl
+	AC_MSG_RESULT($cv_mono_sizeof_sunpath)
+	AC_DEFINE_UNQUOTED(MONO_SIZEOF_SUNPATH, $cv_mono_sizeof_sunpath)
+
 	dnl *****************************
-	dnl *** Checks for libpthread ***
+	dnl *** Checks for libxnet    ***
 	dnl *****************************
-	AC_SEARCH_LIBS(pthread_create, pthread, [
-		AM_CONDITIONAL(THREADS_PTHREAD, true)
-		AC_DEFINE(HAVE_PTHREAD)
-
-		# Need pthread_mutex_timedlock
-		pthread_CFLAGS=""
-		orig_CPPFLAGS=$CPPFLAGS
-		# This is a gcc-specific error, but we already set
-		# gcc-specific options in CFLAGS
-		CPPFLAGS="$CPPFLAGS -Werror-implicit-function-declaration"
-		AC_MSG_CHECKING(for pthread_mutex_timedlock)
-		AC_TRY_COMPILE([ #include <pthread.h>], [
-			pthread_mutex_t mut=PTHREAD_MUTEX_INITIALIZER;
-			pthread_mutex_timedlock(&mut, NULL);
-		], [
-			# Works!
-			AC_MSG_RESULT(yes)
-			AC_DEFINE(HAVE_PTHREAD_MUTEX_TIMEDLOCK)
-		], [
-			AC_MSG_RESULT(no)
-
-			# glibc requires -D_GNU_SOURCE before it will declare
-			# this function
-			AC_MSG_CHECKING(whether _GNU_SOURCE is needed for pthread_mutex_timedlock)
-			CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
-			AC_TRY_COMPILE([ #include <pthread.h>], [
-				pthread_mutex_t mut=PTHREAD_MUTEX_INITIALIZER;
-				pthread_mutex_timedlock(&mut, NULL);
-			], [
-				AC_MSG_RESULT(yes)
-				pthread_CFLAGS="-D_GNU_SOURCE"
-				AC_DEFINE(HAVE_PTHREAD_MUTEX_TIMEDLOCK)
-			], [
-				AC_MSG_RESULT(no)
-				dnl Add other variants here
-				AC_MSG_WARN(Working around pthread_mutex_timedlock)
-			])
-		])
-		CPPFLAGS=$orig_CPPFLAGS
-		CFLAGS="$CFLAGS $pthread_CFLAGS"
-
-		# Need PTHREAD_MUTEX_RECURSIVE
-		pthread_CFLAGS=""
-		orig_CPPFLAGS=$CPPFLAGS
-		# This is a gcc-specific error, but we already set
-		# gcc-specific options in CFLAGS
-		CPPFLAGS="$CPPFLAGS -Werror-implicit-function-declaration"
-		AC_MSG_CHECKING(for PTHREAD_MUTEX_RECURSIVE)
-		AC_TRY_COMPILE([ #include <pthread.h>], [
-			pthread_mutexattr_t attr;
-			pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
-		], [
-			# Works!
-			AC_MSG_RESULT(ok)
-		], [
-			AC_MSG_RESULT(no)
+	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
 
-			# glibc requires -D_GNU_SOURCE before it will declare
-			# this macro
-			AC_MSG_CHECKING(whether _GNU_SOURCE is needed for PTHREAD_MUTEX_RECURSIVE)
-			CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
-			AC_TRY_COMPILE([ #include <pthread.h>], [
-				pthread_mutexattr_t attr;
-				pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
-			], [
-				AC_MSG_RESULT(ok)
-				pthread_CFLAGS="-D_GNU_SOURCE"
-			], [
-				AC_MSG_RESULT(no)
-				dnl Add other variants here
-				AC_MSG_WARN(Using mono_mutex_t for recursive mutexes)
-				AC_DEFINE(USE_MONO_MUTEX)
-			])
-		])
-		CPPFLAGS=$orig_CPPFLAGS
-		CFLAGS="$CFLAGS $pthread_CFLAGS"
+	dnl *****************************
+	dnl *** Checks for libpthread ***
+	dnl *****************************
+	AC_CHECK_LIB(pthread, main, LIBS="$LIBS -lpthread")
+	AC_CHECK_FUNCS(pthread_mutex_timedlock)
+	AC_MSG_CHECKING(for PTHREAD_MUTEX_RECURSIVE)
+	AC_TRY_COMPILE([ #include <pthread.h>], [
+		pthread_mutexattr_t attr;
+		pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE);
 	], [
-		AC_MSG_ERROR([libpthread is required on non-win32 hosts])
+		AC_MSG_RESULT(ok)
+	], [
+		AC_MSG_RESULT(no)
+		AC_MSG_WARN(Using mono_mutex_t for recursive mutexes)
+		AC_DEFINE(USE_MONO_MUTEX)
 	])
 
 	dnl ********************************
 	dnl *** Checks for semaphore lib ***
 	dnl ********************************
 	AC_CHECK_LIB(rt, sem_init, LIBS="$LIBS -lrt")
+
+	dnl ********************************
+	dnl *** Checks for timezone stuff **
+	dnl ********************************
+	AC_CACHE_CHECK(for timezone variable, ac_cv_var_timezone,
+		AC_TRY_COMPILE([
+			#include <time.h>
+		], [
+			timezone = 1;
+		], ac_cv_var_timezone=yes, ac_cv_var_timezone=no))
+	if test $ac_cv_var_timezone = yes; then
+		AC_DEFINE(HAVE_TIMEZONE)
+	else
+		AC_CACHE_CHECK(for tm_gmtoff in struct tm, ac_cv_struct_tm_gmtoff,
+			AC_TRY_COMPILE([
+				#include <time.h>
+				], [
+				struct tm tm;
+				tm.tm_gmtoff = 1;
+				], ac_cv_struct_tm_gmtoff=yes, ac_cv_struct_tm_gmtoff=no))
+		if test $ac_cv_struct_tm_gmtoff = yes; then
+			AC_DEFINE(HAVE_TM_GMTOFF)
+		else
+			AC_ERROR(unable to find a way to determine timezone)
+		fi
+	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
 
-if test "x$cross_compiling" = "xno"; then
-# check for new iconv version
-AC_MSG_CHECKING(for new iconv)
-AC_CACHE_VAL(new_iconv,[
-	AC_TRY_RUN([#include <stdio.h> 
-	        #include <iconv.h>
- 
-		int main()
-		{
-		  exit (iconv_open ("UTF-16le", "UTF-8") == (iconv_t)-1);
-		}
-		],
-		new_iconv=yes,new_iconv=)])
-if test -n "$new_iconv"; then
-   	AC_MSG_RESULT(yes)
-	AC_DEFINE(HAVE_NEW_ICONV)
+dnl ****************************
+dnl *** Look for /dev/random ***
+dnl ****************************
+
+AC_MSG_CHECKING([if usage of random device is requested])
+AC_ARG_ENABLE(dev-random,
+[  --disable-dev-random    disable the use of the random device],
+try_dev_random=$enableval, try_dev_random=yes)
+AC_MSG_RESULT($try_dev_random)
+
+case "{$target}" in
+    *-openbsd*)
+    NAME_DEV_RANDOM="/dev/srandom"
+    ;;
+
+dnl Win32 does not have /dev/random, they have their own method...
+
+    *-*-mingw*|*-*-cygwin*)
+    ac_cv_have_dev_random = no
+    ;;
+
+dnl Everywhere else, it's /dev/random
+
+    *)
+    NAME_DEV_RANDOM="/dev/random"
+    ;;
+esac
+
+AC_DEFINE_UNQUOTED(NAME_DEV_RANDOM, "$NAME_DEV_RANDOM")
+
+dnl Now check if the device actually exists
+
+if test "x$try_dev_random" = "xyes"; then
+    AC_CACHE_CHECK(for random device, ac_cv_have_dev_random,
+    [if test -r "$NAME_DEV_RANDOM" ; then
+        ac_cv_have_dev_random=yes; else ac_cv_have_dev_random=no; fi])
+    if test "x$ac_cv_have_dev_random" = "xyes"; then
+        AC_DEFINE(HAVE_CRYPT_RNG)
+    fi
 else
-	AC_MSG_RESULT(no)
+    AC_MSG_CHECKING(for random device)
+    ac_cv_have_dev_random=no
+    AC_MSG_RESULT(has been disabled)
 fi
+
+if test "x$platform_win32" = "xyes"; then
+    AC_DEFINE(HAVE_CRYPT_RNG)
+fi
+
+if test "x$ac_cv_have_dev_random" = "xno" \
+    && test "x$platform_win32" = "xno"; then
+    AC_MSG_WARN([[
+***
+*** A system-provided entropy source was not found on this system.
+*** Because of this, the System.Security.Cryptography random number generator
+*** will throw a NotImplemented exception.
+***
+*** If you are seeing this message, and you know your system DOES have an
+*** entropy collection in place, please contact <crichton@gimp.org> and
+*** provide information about the system and how to access the random device.
+***
+*** For those systems who lack a random device, EGD support is forthcoming.
+***]])
+fi
+ 
+AC_MSG_CHECKING([if inter-process shared handles are requested])
+AC_ARG_ENABLE(shared-handles, [  --disable-shared-handles disable inter-process shared handles], try_shared_handles=$enableval, try_shared_handles=yes)
+AC_MSG_RESULT($try_shared_handles)
+if test "x$try_shared_handles" != "xyes"; then
+	AC_DEFINE(DISABLE_SHARED_HANDLES)
+	AC_SUBST(DISABLE_SHARED_HANDLES)
 fi
 
 TARGET="unknown"
@@ -375,12 +470,13 @@ i*86-*-*) TARGET=X86; arch_target=x86;;
 sparc*-*-*) TARGET=SPARC; arch_target=sparc; ACCESS_UNALIGNED="no";;
 #alpha*-*-linux* | alpha*-*-osf*) TARGET=ALPHA; ACCESS_UNALIGNED="no";;
 #m68k-*-linux*) TARGET=M68K;;
-powerpc-*-linux* | powerpc-*-sysv*) TARGET=POWERPC; arch_target=ppc;;
-#arm-*-linux-*) TARGET=ARM; ACCESS_UNALIGNED="no";;
+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
-	CFLAGS="$CFLAGS -DNO_PORT"
+	CPPFLAGS="$CPPFLAGS -DNO_PORT"
 	AC_MSG_WARN("mono has not been ported to $host: some things may not work.")
 fi
 
@@ -396,28 +492,51 @@ 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)
 
 AC_SUBST(arch_target)
 AC_SUBST(CFLAGS)
+AC_SUBST(CPPFLAGS)
 
 AC_OUTPUT([
 Makefile
+mono.pc
 mono/Makefile
+mono/utils/Makefile
 mono/metadata/Makefile
 mono/dis/Makefile
 mono/cil/Makefile
 mono/arch/Makefile
+mono/os/Makefile
+mono/os/win32/Makefile
+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
-mono/wrapper/Makefile
+mono/benchmark/Makefile
 mono/monoburg/Makefile
+mono/monograph/Makefile
 mono/jit/Makefile
 mono/io-layer/Makefile
+mono/handles/Makefile
 runtime/Makefile
 scripts/Makefile
 man/Makefile
 doc/Makefile
+docs/Makefile
+data/Makefile
+mono.spec
 ])
+
+echo "
+
+	GC:	$gc
+
+"