X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=configure.in;h=b6afda02ddda44c55b25a9970c244ad2cc3c5f44;hb=8a3f91bf2b9310ac33f92f22692e1cfb70260b52;hp=4a67c1c03506bcc84d1b4d714617a4bc19d60687;hpb=cf4ead42cfbef1ddfe6f8541ab04a6710a7e900a;p=mono.git

diff --git a/configure.in b/configure.in
index 4a67c1c0350..b6afda02ddd 100644
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,7 @@
 AC_INIT(README)
 AC_CANONICAL_SYSTEM
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(mono, 0.11)
+AM_INIT_AUTOMAKE(mono, 0.14)
 AM_MAINTAINER_MODE
 
 dnl ****************************************
@@ -14,9 +14,11 @@ case "$host" in
 		platform_win32=yes
 		AC_DEFINE(PLATFORM_WIN32)
 		CC="gcc -mno-cygwin"
+		libdl=
 		;;
 	*)
 		platform_win32=no
+		libdl="-ldl"
 		;;
 esac
 AC_MSG_RESULT($platform_win32)
@@ -27,6 +29,12 @@ AC_PROG_CC
 AM_PROG_CC_STDC
 AC_PROG_INSTALL
 
+AC_CHECK_PROG(BISON, bison, ,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
@@ -98,7 +106,7 @@ AC_SUBST(GLIB_LIBS)
 AC_SUBST(GMODULE_CFLAGS)
 AC_SUBST(GMODULE_LIBS)
 
-AC_CHECK_LIB(gc, GC_malloc, found_boehm="yes")
+AC_CHECK_LIB(gc, GC_malloc, found_boehm="yes",,$libdl)
 gc=auto
 AC_ARG_WITH(gc, [  --with-gc=boehm,none],[gc=$with_gc])
 
@@ -110,7 +118,7 @@ case "x$gc" in
 
 		AC_DEFINE(HAVE_BOEHM_GC)
 		AC_SUBST(HAVE_BOEHM_GC)
-		LIBS="$LIBS -lgc"
+		LIBS="$LIBS -lgc $libdl"
 		;;
 	xnone)
 		AC_MSG_WARN("Compiling mono without GC.")
@@ -123,7 +131,7 @@ dnl		# If libgc was found, use it.  Otherwise just warn.
 		else
 			AC_DEFINE(HAVE_BOEHM_GC)
 			AC_SUBST(HAVE_BOEHM_GC)
-			LIBS="$LIBS -lgc"
+			LIBS="$LIBS -lgc $libdl"
 			gc="boehm"
 		fi
 dnl		AC_MSG_WARN("Compiling mono without GC.")
@@ -138,7 +146,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
@@ -160,7 +168,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)
@@ -183,6 +191,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 *****************************
@@ -250,6 +273,29 @@ 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 <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 *****************************
@@ -292,7 +338,7 @@ if test x$platform_win32 = xno; then
 			])
 		])
 		CPPFLAGS=$orig_CPPFLAGS
-		CFLAGS="$CFLAGS $pthread_CFLAGS"
+		CPPFLAGS="$CPPFLAGS $pthread_CFLAGS"
 
 		# Need PTHREAD_MUTEX_RECURSIVE
 		pthread_CFLAGS=""
@@ -328,7 +374,7 @@ if test x$platform_win32 = xno; then
 			])
 		])
 		CPPFLAGS=$orig_CPPFLAGS
-		CFLAGS="$CFLAGS $pthread_CFLAGS"
+		CPPFLAGS="$CPPFLAGS $pthread_CFLAGS"
 	], [
 		AC_MSG_ERROR([libpthread is required on non-win32 hosts])
 	])
@@ -337,7 +383,34 @@ if test x$platform_win32 = xno; then
 	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
+	AM_CONDITIONAL(THREADS_PTHREAD, false)
 	# This is a kludge, we really ought to test for libws2_32, but
 	# I can't make AC_CHECK_LIB link (the symbols seem to be mangled
 	# with @num suffixes)
@@ -431,6 +504,14 @@ else
 fi
 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"
 ACCESS_UNALIGNED="yes"
 
@@ -441,11 +522,11 @@ 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; arch_target=arm; ACCESS_UNALIGNED="no";;
+arm-*-linux-* | armv4l-*-linux-*) TARGET=ARM; arch_target=arm; 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
 
@@ -464,15 +545,20 @@ AM_CONDITIONAL(ARM, test x$TARGET = xARM)
 
 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
@@ -484,6 +570,7 @@ mono/monoburg/Makefile
 mono/monograph/Makefile
 mono/jit/Makefile
 mono/io-layer/Makefile
+mono/handles/Makefile
 runtime/Makefile
 scripts/Makefile
 man/Makefile