X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=configure.in;h=b5d8e2f79a81549a1899d665543947d3eac56b0a;hb=5cec043e40796be9bedf864b4147d4677411b776;hp=734650e65ba263998ac80dfd70a1331764e7b6bc;hpb=d470e0ca31c5aeae86f8f2bb816eb8e2d78f6471;p=mono.git

diff --git a/configure.in b/configure.in
index 734650e65ba..b5d8e2f79a8 100644
--- a/configure.in
+++ b/configure.in
@@ -1254,13 +1254,6 @@ if test x$platform_win32 = xno; then
 	dnl **********************************
 	dnl *** Checks for MonoPosixHelper ***
 	dnl **********************************
-	AC_CHECK_FUNC(setkey, ,
-		AC_CHECK_LIB(crypt, setkey, [ 
-			AC_DEFINE(HAVE_SETKEY, 1, [Define if setkey(3) is available]) 
-			CRYPT_LIBS="-lcrypt" 
-		])
-	)
-	AC_SUBST(CRYPT_LIBS)
 	AC_CHECK_HEADERS(checklist.h)
 	AC_CHECK_HEADERS(fstab.h)
 	AC_CHECK_HEADERS(attr/xattr.h)
@@ -1857,20 +1850,6 @@ AC_CONFIG_FILES([runtime/mono-wrapper],[chmod +x runtime/mono-wrapper])
 AC_CONFIG_FILES([runtime/monodis-wrapper],[chmod +x runtime/monodis-wrapper])
 AC_CONFIG_FILES([runtime/semdel-wrapper],[chmod +x runtime/semdel-wrapper])
 
-AC_CONFIG_COMMANDS([runtime/etc/mono/config],
-[   depth=../../..
-    case $srcdir in
-    [[\\/$]]* | ?:[[\\/]]* ) reldir=$srcdir ;;
-    .) reldir=$depth ;;
-    *) reldir=$depth/$srcdir ;;
-    esac
-    $ac_aux_dir/install-sh -d runtime/etc/mono
-    cd runtime/etc/mono
-    rm -f config
-    $LN_S $reldir/data/config config
-    cd $depth
-],[LN_S='$LN_S'])
-
 AC_CONFIG_COMMANDS([runtime/etc/mono/1.0/machine.config],
 [   depth=../../../..
     case $srcdir in
@@ -2035,7 +2014,7 @@ echo "
 	$disabled
 
 "
-if test x$with_static_mono = xno; then
+if test x$with_static_mono = xno -a "x$platform_win32" != "xyes"; then
    AC_MSG_WARN(Turning off static Mono is a risk, you might run into unexepcted bugs)
 fi