* configure.in: Remove check for setkey(3).

 	* support/Makefile.am: Remove CRYPT_LIBS use; we no longer rely on libcrypt.
 	* support/stdlib.c: Remove setkey(3) wrapper.
 	* support/unistd.c: Remove encrypt(3) wrapper.

svn path=/trunk/mono/; revision=65458

diff --git a/ChangeLog b/ChangeLog
index 2bb8bcc059aa4413b94684ba9afcd6bb1c7c99f0..341d5979ea5cc6439aa16394dfcf84e4329bdf68 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2006-09-15  Jonathan Pryor  <jonpryor@vt.edu>
+
+       * configure.in: Remove check for setkey(3).
+
 2006-09-13  Jonathan Pryor  <jonpryor@vt.edu>
 
        * configure.in: Add command to create runtime/etc/mono/config.  This is

diff --git a/configure.in b/configure.in
index 734650e65ba263998ac80dfd70a1331764e7b6bc..0ca236712bd3cc722555de210bd46b4a21e3b69e 100644 (file)
--- 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)

diff --git a/support/ChangeLog b/support/ChangeLog
index 6f01634b579e0410aec731e1d97a8508b9de51e5..be447a47b6d617075de73dd9770cf040b5ee42f9 100644 (file)
--- a/support/ChangeLog
+++ b/support/ChangeLog
@@ -1,3 +1,9 @@
+2006-09-15  Jonathan Pryor  <jonpryor@vt.edu>
+
+       * Makefile.am: Remove CRYPT_LIBS use; we no longer rely on libcrypt.
+       * stdlib.c: Remove setkey(3) wrapper.
+       * unistd.c: Remove encrypt(3) wrapper.
+
 2006-08-13  Miguel de Icaza  <miguel@novell.com>
 
        * serial.c (get_bytes_in_buffer): Change the signature, we do not

diff --git a/support/Makefile.am b/support/Makefile.am
index 13c4eaf76c306ee5e1cd5d8b9a123005cb164e1b..e56d1a1b69c5e401ff353e190b16c41b26284631 100644 (file)
--- a/support/Makefile.am
+++ b/support/Makefile.am
@@ -54,7 +54,7 @@ MPH_SOURCE = $(MPH_C_SOURCE)
 MPH_LIBS   =
 else
 MPH_SOURCE = $(MPH_C_SOURCE) $(MPH_UNIX_SOURCE)
-MPH_LIBS   = $(GLIB_LIBS) $(CRYPT_LIBS)
+MPH_LIBS   = $(GLIB_LIBS)
 endif
 
 if HAVE_ZLIB

diff --git a/support/stdlib.c b/support/stdlib.c
index 9ab875cab404568536fa1633cea40c5a9c1eb8f9..4c1b6728c3a3d0cced2c703b2a551374e0ee4cab 100644 (file)
--- a/support/stdlib.c
+++ b/support/stdlib.c
@@ -64,16 +64,6 @@ Mono_Posix_Stdlib_realloc (void* ptr, mph_size_t size)
        return realloc (ptr, (size_t) size);
 }
 
-#ifdef HAVE_SETKEY
-int
-Mono_Posix_Syscall_setkey (const char* key)
-{
-       errno = 0;
-       setkey (key);
-       return errno == 0 ? 0 : -1;
-}
-#endif /* ndef HAVE_SETKEY */
-
 G_END_DECLS
 
 /*

diff --git a/support/unistd.c b/support/unistd.c
index 740afe79e5841654d539cb68ebe9918910c1e477..352bdce87d47b41b973084eb6729b12b42958cb9 100644 (file)
--- a/support/unistd.c
+++ b/support/unistd.c
@@ -235,14 +235,6 @@ Mono_Posix_Syscall_swab (void *from, void *to, mph_ssize_t n)
        swab (from, to, (ssize_t) n);
 }
 
-int
-Mono_Posix_Syscall_encrypt (void* block, int edflag)
-{
-       errno = 0;
-       encrypt (block, edflag);
-       return errno == 0 ? 0 : -1;
-}
-
 int
 Mono_Posix_Syscall_setusershell (void)
 {