X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=configure.in;h=ec7d6ac16a8e2563c49dadb77852c08e3097095e;hb=7b7756f7909e11371315a0d621ead90ae5042eec;hp=9da49c241b9573747b682ab933743d17cad1240c;hpb=15f9f87eeb925d3dbb6f4db9d85b688d460a000f;p=mono.git

diff --git a/configure.in b/configure.in
index 9da49c241b9..ec7d6ac16a8 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.6.10)
 AM_MAINTAINER_MODE
 
 AC_PROG_LN_S
@@ -114,8 +114,8 @@ 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"
@@ -123,35 +123,10 @@ case "$host" in
 		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_nptl=no
-		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"
-		fi
-		need_link_unlink=yes
-		AC_DEFINE(PTHREAD_POINTER_ID)
-		libdl=
-		libgc_threads=pthreads
-# TLS is only partially implemented on -CURRENT (compiler support
-# but NOT library support)
 #
 		with_tls=pthread
 		;;
@@ -165,8 +140,8 @@ 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"
@@ -212,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
@@ -277,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
@@ -866,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")
 		;;
@@ -1152,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)
@@ -1338,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])
 
@@ -1616,8 +1567,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
 ])
 
@@ -1669,6 +1620,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=../../../..
@@ -1750,16 +1702,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}