diff options
| author | Jonathan Pryor <jpryor@novell.com> | 2005-12-01 22:34:09 +0300 |
|---|---|---|
| committer | Jonathan Pryor <jpryor@novell.com> | 2005-12-01 22:34:09 +0300 |
| commit | 05207de43ff80e39a88a5abe765b52725dd0089b (patch) | |
| tree | b231ea4d132a6e4c02ee8d2669a76ff7ff93f7d4 /support | |
| parent | de030a11c5f9e20cb5bae4e22351c3ee87a0faf2 (diff) | |
* configure.in: Check for setkey(3) in -lcrypt and define CRYPT_LIBS
accordingly.
* support/Makefile.am: Use $(CRYPT_LIB), not -lcrypt, as not all platforms
support -lcrypt.
* support/stdlib.c: Wrap Mono_Posix_Syscall_setkey() within HAVE_SETKEY,
not PLATFORM_WIN32
svn path=/trunk/mono/; revision=53787
Diffstat (limited to 'support')
| -rw-r--r-- | support/ChangeLog | 7 | ||||
| -rw-r--r-- | support/Makefile.am | 3 | ||||
| -rw-r--r-- | support/stdlib.c | 4 |
3 files changed, 10 insertions, 4 deletions
diff --git a/support/ChangeLog b/support/ChangeLog index acf7f3f4312..05b052c7e74 100644 --- a/support/ChangeLog +++ b/support/ChangeLog @@ -1,3 +1,10 @@ +2005-12-01 Jonathan Pryor <jonpryor@vt.edu> + + * Makefile.am: Use $(CRYPT_LIB), not -lcrypt, as not all platforms + support -lcrypt. + * stdlib.c: Wrap Mono_Posix_Syscall_setkey() within HAVE_SETKEY, not + PLATFORM_WIN32 + 2005-12-01 Daniel Drake <dsd@gentoo.org> * Makefile.am: Link against libcrypt, needed for setkey(3) as referenced diff --git a/support/Makefile.am b/support/Makefile.am index e1fac9e112d..13c4eaf76c3 100644 --- a/support/Makefile.am +++ b/support/Makefile.am @@ -54,8 +54,7 @@ MPH_SOURCE = $(MPH_C_SOURCE) MPH_LIBS = else MPH_SOURCE = $(MPH_C_SOURCE) $(MPH_UNIX_SOURCE) -# -lcrypt needed for setkey(3) -MPH_LIBS = $(GLIB_LIBS) +MPH_LIBS = $(GLIB_LIBS) $(CRYPT_LIBS) endif if HAVE_ZLIB diff --git a/support/stdlib.c b/support/stdlib.c index 55d866428fc..9ab875cab40 100644 --- a/support/stdlib.c +++ b/support/stdlib.c @@ -64,7 +64,7 @@ Mono_Posix_Stdlib_realloc (void* ptr, mph_size_t size) return realloc (ptr, (size_t) size); } -#ifndef PLATFORM_WIN32 +#ifdef HAVE_SETKEY int Mono_Posix_Syscall_setkey (const char* key) { @@ -72,7 +72,7 @@ Mono_Posix_Syscall_setkey (const char* key) setkey (key); return errno == 0 ? 0 : -1; } -#endif /* ndef PLATFORM_WIN32 */ +#endif /* ndef HAVE_SETKEY */ G_END_DECLS |