X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=configure.in;h=4722d125a3b06a02972677aea1f0a45a1c792e21;hb=4347c57e9783cf9348af2e0ec773024ab6d9b9fc;hp=c8f3d1739d5b37a324dca8a09142198119d79623;hpb=b547e31639136d265055c84ce2d743e1ba5b176a;p=mono.git

diff --git a/configure.in b/configure.in
index c8f3d1739d5..4722d125a3b 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.91)
+AM_INIT_AUTOMAKE(mono,0.95)
 AM_MAINTAINER_MODE
 
 dnl
@@ -30,21 +30,29 @@ AC_SUBST(libmono_ldflags)
 dnl if linker handles the version script
 no_version_script=no
 
+# Set to yes if Unix sockets cannot be created in an anonymous namespace
+need_link_unlink=no
+
 # Thread configuration inspired by sleepycat's db
 AC_MSG_CHECKING([host platform characteristics])
 libgc_threads=no
 case "$host" in
 	*-*-mingw*|*-*-cygwin*)
 		platform_win32=yes
-		AC_DEFINE(PLATFORM_WIN32)
+		AC_DEFINE(PLATFORM_WIN32,1,[Platform is Win32])
 		CC="gcc -mno-cygwin"
 		HOST_CC="gcc"
+		# So libgc configure gets -mno-cygwin
+		export CC
 # latest libgc already defines GC_WIN32_THREADS
 #		CPPFLAGS="$CPPFLAGS -DGC_WIN32_THREADS -DWIN32_THREADS"
 		CPPFLAGS="$CPPFLAGS -DWIN32_THREADS"
 		libdl=
 		libgc_threads=win32
 		gc_default=boehm 
+		with_nptl=no
+		with_sigaltstack=no
+
 		;;
 	*-*-*netbsd*)
 		platform_win32=no
@@ -52,9 +60,9 @@ case "$host" in
 		libmono_cflags="-D_REENTRANT"
 		LDFLAGS="$LDFLAGS -pthread"
 		libmono_ldflags="-pthread"
-		AC_DEFINE(NEED_LINK_UNLINK)
+		need_link_unlink=yes
 		libdl=
-		libgc_threads=pthreads
+		libgc_threads=no
 		;;
 	*-*-*freebsd*|*-*-*openbsd*)
 		platform_win32=no
@@ -62,15 +70,15 @@ case "$host" in
 		libmono_cflags="-D_THREAD_SAFE"
 		LDFLAGS="$LDFLAGS -pthread"
 		libmono_ldflags="-pthread"
-		AC_DEFINE(NEED_LINK_UNLINK)
+		need_link_unlink=yes
 		AC_DEFINE(PTHREAD_POINTER_ID)
 		libdl=
 		libgc_threads=pthreads
 		;;
 	*-*-linux*)
 		platform_win32=no
-		CPPFLAGS="$CPPFLAGS -DGC_LINUX_THREADS -DMONO_USE_EXC_TABLES -D_GNU_SOURCE -D_REENTRANT -fexceptions"
-		libmono_cflags="-DMONO_USE_EXC_TABLES -fexceptions -D_REENTRANT"
+		CPPFLAGS="$CPPFLAGS -DGC_LINUX_THREADS -D_GNU_SOURCE -D_REENTRANT"
+		libmono_cflags="-D_REENTRANT"
 		libmono_ldflags="-lpthread"
 		libdl="-ldl"
 		libgc_threads=pthreads
@@ -83,12 +91,12 @@ case "$host" in
 		libmono_cflags="-D_REENTRANT"
 		libmono_ldflags="-lpthread"
 		libgc_threads=pthreads
-		AC_DEFINE(NEED_LINK_UNLINK)
+		need_link_unlink=yes
                 ;;
 	*-*-solaris*)
 		platform_win32=no
 		CPPFLAGS="$CPPFLAGS -DGC_SOLARIS_THREADS -DGC_SOLARIS_PTHREADS -D_REENTRANT"
-		AC_DEFINE(NEED_LINK_UNLINK)
+		need_link_unlink=yes
 		libmono_cflags="-D_REENTRANT"
 		libgc_threads=pthreads
 		;;
@@ -98,13 +106,12 @@ case "$host" in
 		libmono_cflags="-D_THREAD_SAFE"
 		LDFLAGS="$LDFLAGS -pthread"
 		libmono_ldflags="-pthread"
-		AC_DEFINE(NEED_LINK_UNLINK)
+		need_link_unlink=yes
 		AC_DEFINE(PTHREAD_POINTER_ID)
 		AC_DEFINE(USE_MACH_SEMA)
 		no_version_script=yes
 		libdl=
-		libgc_threads=no
-		gc_default=none 
+		libgc_threads=pthreads
 		;;
 	*)
 		AC_MSG_WARN([*** Please add $host to configure.in checks!])
@@ -113,6 +120,11 @@ case "$host" in
 		;;
 esac
 AC_MSG_RESULT(ok)
+
+if test x$need_link_unlink = xyes; then
+   AC_DEFINE(NEED_LINK_UNLINK, 1, [Define if Unix sockets cannot be created in an anonymous namespace])
+fi
+
 AM_CONDITIONAL(PLATFORM_WIN32, test x$platform_win32 = xyes)
 
 AC_CHECK_TOOL(CC, gcc, gcc)
@@ -308,9 +320,9 @@ case "x$gc" in
 		;;
 esac
 
-we_are_embedded_in_mono=yes
-export we_are_embedded_in_mono
-export libgc_threads
+
+# tell libgc/configure about what we want
+ac_configure_args="$ac_configure_args --disable-embed-check --with-libgc-threads=$libgc_threads"
 
 AM_CONDITIONAL(INCLUDED_LIBGC, test x$use_included_gc = xyes)
 AC_SUBST(LIBGC_CFLAGS)
@@ -854,11 +866,6 @@ if test x$platform_win32 = xno; then
 		AC_MSG_RESULT(no)
 	]) 
 
-	dnl *********************
-	dnl * Check for scandir *
-	dnl *********************
-	AC_CHECK_FUNCS(scandir)
-
 	dnl *********************
 	dnl *** Check for AIO ***
 	dnl *********************
@@ -894,6 +901,7 @@ if test x$platform_win32 = xno; then
 		AC_DEFINE_UNQUOTED(SIGVAL_PTR,$SIGVAL_PTR,[Pointer field name in 'union sigval'])
 	fi
 else
+	jdk_headers_found=no
 	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
@@ -913,13 +921,13 @@ ac_cv_c_socklen_t=yes
 	AC_MSG_RESULT(no)
 ])
 
-AC_CHECK_FUNCS(truncl, , AC_MSG_CHECKING(for truncl in math.h)
+AC_CHECK_FUNCS(trunc, , AC_MSG_CHECKING(for trunc in math.h)
 	AC_TRY_LINK([#include <math.h>], 
-	[ truncl(0.0); ], 
+	[ trunc(0.0); ], 
 	[
-		AC_DEFINE(HAVE_TRUNCL) 
+		AC_DEFINE(HAVE_TRUNC) 
 		AC_MSG_RESULT(yes)
-		ac_cv_truncl=yes
+		ac_cv_trunc=yes
 	],
 	AC_MSG_RESULT(no)))
 
@@ -945,7 +953,7 @@ case "{$target}" in
 dnl Win32 does not have /dev/random, they have their own method...
 
     *-*-mingw*|*-*-cygwin*)
-    ac_cv_have_dev_random = no
+    ac_cv_have_dev_random=no
     ;;
 
 dnl Everywhere else, it's /dev/random
@@ -1130,6 +1138,9 @@ case "$host" in
 	libsuffix=".dylib"
 	LIBC="libc.dylib"
 	;;
+     *-*-*netbsd*)
+	LIBC="libc.so.12"
+	;;
 esac
 AC_SUBST(libsuffix)
 
@@ -1236,6 +1247,8 @@ samples/Makefile
 support/Makefile
 data/config
 mono.spec
+tools/Makefile
+tools/locale-builder/Makefile
 ])
 
 echo "