X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=configure.in;h=8531d428198f1fd907093cc312863f8199e045ad;hb=9f7380675aa902a4772be1d307044ee68d30d46f;hp=7290f65899872afabb88e700da098af9b4cc02f6;hpb=d0ef0978901d5a84728bdd4e83204f98ccc34da4;p=mono.git

diff --git a/configure.in b/configure.in
index 7290f658998..8531d428198 100644
--- a/configure.in
+++ b/configure.in
@@ -6,7 +6,7 @@ AC_CANONICAL_SYSTEM
 m4_ifdef([_A][M_PROG_TAR],[_A][M_SET_OPTION([tar-ustar])])
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(mono,1.1.7)
+AM_INIT_AUTOMAKE(mono,1.1.7.99)
 AM_MAINTAINER_MODE
 
 AC_PROG_LN_S
@@ -100,13 +100,10 @@ case "$host" in
 		AC_DEFINE(PTHREAD_POINTER_ID)
 		libdl=
 		libgc_threads=pthreads
-# TLS isn't implemented at all on -STABLE
+# TLS isn't implemented at all on 4-STABLE
 		with_nptl=no
 		with_tls=pthread
 		;;
-# older versions of -CURRENT will break with these flags but testing
-# indicates these older versions won't run Mono anyway
-#
 	*-*-*freebsd5*)
 		platform_win32=no
 		if test "x$PTHREAD_CFLAGS" = "x"; then
@@ -117,8 +114,34 @@ case "$host" in
 			libmono_cflags="$PTHREAD_CFLAGS"
 		fi
 		if test "x$PTHREAD_LIBS" = "x"; then
-			LDFLAGS="$LDFLAGS -lpthread"
-			libmono_ldflags="-lpthread"
+			LDFLAGS="$LDFLAGS -pthread"
+			libmono_ldflags="-pthread"
+		else
+			LDFLAGS="$LDFLAGS $PTHREAD_LIBS"
+			libmono_ldflags="$PTHREAD_LIBS"
+		fi
+		need_link_unlink=yes
+		AC_DEFINE(PTHREAD_POINTER_ID)
+		libdl=
+		with_sigaltstack=yes
+		libgc_threads=pthreads
+# TLS is only partially implemented on 5-STABLE (compiler support
+# but NOT library support)
+#
+		with_tls=pthread
+		;;
+	*-*-*freebsd6*)
+		platform_win32=no
+		if test "x$PTHREAD_CFLAGS" = "x"; then
+			CPPFLAGS="$CPPFLAGS -DGC_FREEBSD_THREADS"
+			libmono_cflags=
+		else
+			CPPFLAGS="$CPPFLAGS $PTHREAD_CFLAGS -DGC_FREEBSD_THREADS"
+			libmono_cflags="$PTHREAD_CFLAGS"
+		fi
+		if test "x$PTHREAD_LIBS" = "x"; then
+			LDFLAGS="$LDFLAGS -pthread"
+			libmono_ldflags="-pthread"
 		else
 			LDFLAGS="$LDFLAGS $PTHREAD_LIBS"
 			libmono_ldflags="$PTHREAD_LIBS"
@@ -127,10 +150,10 @@ case "$host" in
 		AC_DEFINE(PTHREAD_POINTER_ID)
 		libdl=
 		libgc_threads=pthreads
+		with_sigaltstack=yes
 # TLS is only partially implemented on -CURRENT (compiler support
 # but NOT library support)
 #
-		with_nptl=no
 		with_tls=pthread
 		;;
 	*-*-*openbsd*)
@@ -164,7 +187,7 @@ case "$host" in
                 ;;
 	*-*-solaris*)
 		platform_win32=no
-		CPPFLAGS="$CPPFLAGS -DGC_SOLARIS_THREADS -DGC_SOLARIS_PTHREADS -D_REENTRANT"
+		CPPFLAGS="$CPPFLAGS -DGC_SOLARIS_THREADS -DGC_SOLARIS_PTHREADS -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS"
 		need_link_unlink=yes
 		libmono_cflags="-D_REENTRANT"
 		libgc_threads=pthreads
@@ -229,6 +252,7 @@ AC_SUBST(BUILD_EXEEXT)
 # Set STDC_HEADERS
 AC_HEADER_STDC
 AC_LIBTOOL_WIN32_DLL
+AC_DISABLE_FAST_INSTALL
 AM_PROG_LIBTOOL
 
 # Test whenever ld supports -version-script
@@ -258,7 +282,17 @@ AC_CHECK_HEADERS(syslog.h)
 
 # for mono/dis
 AC_CHECK_HEADERS(wchar.h)
-AC_CHECK_HEADERS(ieeefp.h)
+case "$host" in
+	*-*-*freebsd6*)
+		AC_CHECK_HEADERS(ieeefp.h)
+	;;
+	*-*-*freebsd*)
+		/* Only freebsd6 has a working ieeefp.h */
+	;;
+	*)
+		AC_CHECK_HEADERS(ieeefp.h)
+	;;
+esac
 AC_MSG_CHECKING(for isinf)
 AC_TRY_LINK([#include <math.h>], [
 	int f = isinf (1);
@@ -808,6 +842,12 @@ if test x$platform_win32 = xno; then
 		*-*-*freebsd4*)
 			AC_CHECK_LIB(pthread, main, LIBS="$LIBS -pthread")
 		;;
+		*-*-*freebsd5*)
+			AC_CHECK_LIB(pthread, main, LIBS="$LIBS -pthread")
+		;;
+		*-*-*freebsd6*)
+			AC_CHECK_LIB(pthread, main, LIBS="$LIBS -pthread")
+		;;
 		*)
 			AC_CHECK_LIB(pthread, main, LIBS="$LIBS -lpthread")
 		;;
@@ -837,7 +877,6 @@ if test x$platform_win32 = xno; then
 	else
 		AC_TRY_RUN([
 			#include <pthread.h>
-
 			__thread int i;
 			static int res1, res2;
 
@@ -886,7 +925,9 @@ if test x$platform_win32 = xno; then
 			#include <signal.h>
 			#include <pthread.h>
 			#include <sys/wait.h>
-
+			#if defined(__FreeBSD__) || defined(__NetBSD__)
+			#define SA_STACK SA_ONSTACK
+			#endif
 			static void
 			sigsegv_signal_handler (int _dummy, siginfo_t *info, void *context)
 			{
@@ -1075,6 +1116,16 @@ if test x$platform_win32 = xno; then
 		AC_DEFINE_UNQUOTED(SIGVAL_PTR,$SIGVAL_PTR,[Pointer field name in 'union sigval'])
 	fi
 
+	dnl **********************************
+	dnl *** epoll			   ***
+	dnl **********************************
+	AC_CHECK_HEADERS(sys/epoll.h)
+	haveepoll=no
+	AC_CHECK_FUNCS(epoll_ctl, [haveepoll=yes], )
+	if test "x$haveepoll" = "xyes" -a "x$ac_cv_header_sys_epoll_h" = "xyes" ; then
+		AC_DEFINE(HAVE_EPOLL, 1, [epoll supported])
+	fi
+
 	dnl **********************************
 	dnl *** Checks for MonoPosixHelper ***
 	dnl **********************************
@@ -1083,6 +1134,7 @@ if test x$platform_win32 = xno; then
 	AC_CHECK_HEADERS(sys/sendfile.h)
 	AC_CHECK_HEADERS(sys/statvfs.h)
 	AC_CHECK_HEADERS(sys/vfstab.h)
+	AC_CHECK_HEADERS(sys/xattr.h)
 	AC_CHECK_FUNCS(getdomainname)
 	AC_CHECK_FUNCS(setdomainname)
 	AC_CHECK_FUNCS(fgetgrent)
@@ -1269,38 +1321,6 @@ if test "x$try_shared_handles" != "xyes"; then
 	AC_SUBST(DISABLE_SHARED_HANDLES)
 fi
 
-#
-# ICU 
-#
-ICU_CFLAGS=""
-ICU_LIBS=""
-enable_glob="normal;  default"
-
-probe_icu=false
-AC_ARG_WITH(icu, [  --with-icu=yes/no],
-	if test x$with_icu = xno; then
-	   probe_icu=false;
-	   AC_MSG_RESULT(Will not probe for ICU)
-	fi
-	if test x$with_icu = xyes; then
-	   probe_icu=true;
-	fi
-)
-
-if $probe_icu; then
-	AC_PATH_PROG(ICU_CONFIG, icu-config, no)
-	if test "x$ICU_CONFIG" = "xno" -o ! -x "$ICU_CONFIG"; then
-		enable_glob="ICU not found, using non-ICU globalization code."
-	else
-		enable_glob="ICU, unsupported. Version: `$ICU_CONFIG --version`"
-		AC_DEFINE(HAVE_ICU)
-		ICU_CFLAGS=`$ICU_CONFIG --cppflags`
-		ICU_LIBS=`$ICU_CONFIG --ldflags`
-	fi
-fi
-AC_SUBST(ICU_CFLAGS)
-AC_SUBST(ICU_LIBS)
-
 AC_ARG_ENABLE(nunit-tests, [ --enable-nunit-tests	Run the nunit tests of the class library on 'make check'])
 AM_CONDITIONAL(ENABLE_NUNIT_TESTS, [test x$enable_nunit_tests = xyes])
 
@@ -1311,6 +1331,9 @@ JIT_SUPPORTED=no
 INTERP_SUPPORTED=no
 LIBC="libc.so.6"
 INTL="libc.so.6"
+SQLITE="libsqlite.so.0"
+SQLITE3="libsqlite3.so.0"
+X11="libX11.so.6.2"
 
 jit_wanted=false
 interp_wanted=false
@@ -1340,8 +1363,12 @@ case "$host" in
 		arch_target=sparc;
 		JIT_SUPPORTED=yes
 		ACCESS_UNALIGNED="no"
-		LIBC="libc.so"
-		INTL="libintl.so"
+		case $host_os in
+		  linux*) ;;
+		  *)
+			LIBC="libc.so"
+			INTL="libintl.so"
+		esac
 		jit_wanted=true
 		if test x"$GCC" = xyes; then
 			CFLAGS="$CFLAGS -Wno-cast-align"
@@ -1354,6 +1381,11 @@ case "$host" in
 		INTERP_SUPPORTED=yes
 		interp_wanted=true
 		arch_target=alpha;
+		case $host_os in
+		  linux*)
+			LIBC="libc.so.6.1"
+			INTL="libc.so.6.1"
+		esac
 	       ;;
 	*-*-mingw*|*-*-cygwin*)
 		INTL="intl"
@@ -1462,6 +1494,9 @@ case "$host" in
 	libsuffix=".dylib"
 	LIBC="libc.dylib"
 	INTL="libintl.dylib"
+	SQLITE="libsqlite.0.dylib"
+	SQLITE3="libsqlite3.0.dylib"
+	X11="libX11.dylib"
 	;;
      *-*-*netbsd*)
 	LIBC="libc.so.12"
@@ -1547,8 +1582,8 @@ fi
 
 PREVIEW=yes
 AC_ARG_WITH(preview, [ --with-preview=yes,no     If you want to install the 2.0 FX preview],[
-	if test x$with_preview = xyes; then
-	      PREVIEW=yes
+	if test x$with_preview = xno; then
+	      PREVIEW=no
 	fi
 ])
 
@@ -1575,6 +1610,9 @@ AM_CONDITIONAL(INCLUDED_LIBGC, test x$gc = xincluded)
 
 AC_SUBST(LIBC)
 AC_SUBST(INTL)
+AC_SUBST(SQLITE)
+AC_SUBST(SQLITE3)
+AC_SUBST(X11)
 
 AC_SUBST(arch_target)
 AC_SUBST(CFLAGS)
@@ -1600,6 +1638,7 @@ fi
 AC_SUBST(mono_cfg_dir)
 
 AC_CONFIG_FILES([runtime/mono-wrapper],[chmod +x runtime/mono-wrapper])
+AC_CONFIG_FILES([runtime/monodis-wrapper],[chmod +x runtime/monodis-wrapper])
 
 AC_CONFIG_COMMANDS([runtime/etc/mono/1.0/machine.config],
 [   depth=../../../..
@@ -1652,6 +1691,7 @@ mono/arch/s390/Makefile
 mono/arch/s390x/Makefile
 mono/arch/arm/Makefile
 mono/arch/alpha/Makefile
+mono/arch/ia64/Makefile
 mono/interpreter/Makefile
 mono/tests/Makefile
 mono/tests/tests-config
@@ -1659,8 +1699,8 @@ mono/benchmark/Makefile
 mono/monoburg/Makefile
 mono/monograph/Makefile
 mono/io-layer/Makefile
-mono/handles/Makefile
 mono/mini/Makefile
+mono/handles/Makefile
 mono/profiler/Makefile
 ikvm-native/Makefile
 scripts/Makefile
@@ -1681,16 +1721,22 @@ runtime/Makefile
 
 (
   case $prefix in
-  NONE) prefix=/usr/local ;;
+  NONE) prefix=$ac_default_prefix ;;
   esac
   case $exec_prefix in
-  NONE | '${prefix}') exec_prefix=$prefix ;;
+  NONE) exec_prefix='${prefix}' ;;
   esac
 
+  test -w $srcdir/$mcsdir/build || chmod +w $srcdir/$mcsdir/build
+
   echo "prefix=$prefix" > $srcdir/$mcsdir/build/config.make
   echo "exec_prefix=$exec_prefix" >> $srcdir/$mcsdir/build/config.make
-  echo "mono_libdir=$exec_prefix/lib" >> $srcdir/$mcsdir/build/config.make
+  echo 'mono_libdir=${exec_prefix}/lib' >> $srcdir/$mcsdir/build/config.make
   echo 'MCS_FLAGS = $(PLATFORM_DEBUG_FLAGS)' >> $srcdir/$mcsdir/build/config.make
+  echo 'IL_FLAGS = /debug' >> $srcdir/$mcsdir/build/config.make
+  echo "RUNTIME = $mono_build_root/runtime/mono-wrapper" >> $srcdir/$mcsdir/build/config.make
+  echo "ILDISASM = $mono_build_root/runtime/monodis-wrapper" >> $srcdir/$mcsdir/build/config.make
+  echo "INSTALL = $INSTALL" >> $srcdir/$mcsdir/build/config.make
 )
 
 libgdiplus_msg=${libgdiplus_loc:-assumed to be installed}