diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2007-04-29 14:39:02 +1000 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2007-04-29 14:39:02 +1000 |
| commit | 6d862a50dbe6a473c2e204d85d3e66e6a0293614 (patch) | |
| tree | 1463a5f23f29be1703690ff9c37b8120782d9071 | |
| parent | 2ac529b5055ebccd5c2251e373940eee156dc967 (diff) | |
- (dtucker) [configure.ac defines.h] Have configure check for MAXSYMLINKS
so we don't get redefinition warnings.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | defines.h | 4 |
3 files changed, 11 insertions, 5 deletions
@@ -6,6 +6,8 @@ platform's _res if it has one. Should fix problem of DNSSEC record lookups on NetBSD as reported by Curt Sampson. - (dtucker) [openbsd-compat/xmmap.c] Include stdlib.h for mkstemp prototype. + - (dtucker) [configure.ac defines.h] Have configure check for MAXSYMLINKS + so we don't get redefinition warnings. 20070406 - (dtucker) [INSTALL] Update the systems that have PAM as standard. Link @@ -2887,4 +2889,4 @@ OpenServer 6 and add osr5bigcrypt support so when someone migrates passwords between UnixWare and OpenServer they will still work. OK dtucker@ -$Id: ChangeLog,v 1.4655 2007/04/29 04:02:43 dtucker Exp $ +$Id: ChangeLog,v 1.4656 2007/04/29 04:39:02 dtucker Exp $ diff --git a/configure.ac b/configure.ac index 4d551b89..f2e88f1f 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -# $Id: configure.ac,v 1.376 2007/04/29 03:58:07 dtucker Exp $ +# $Id: configure.ac,v 1.377 2007/04/29 04:39:03 dtucker Exp $ # # Copyright (c) 1999-2004 Damien Miller # @@ -15,7 +15,7 @@ # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org) -AC_REVISION($Revision: 1.376 $) +AC_REVISION($Revision: 1.377 $) AC_CONFIG_SRCDIR([ssh.c]) AC_CONFIG_HEADER(config.h) @@ -1364,6 +1364,10 @@ AC_CHECK_DECLS(writev, , , [ #include <unistd.h> ]) +AC_CHECK_DECLS(MAXSYMLINKS, , , [ +#include <sys/param.h> + ]) + AC_CHECK_FUNCS(setresuid, [ dnl Some platorms have setresuid that isn't implemented, test for this AC_MSG_CHECKING(if setresuid seems to work) @@ -25,7 +25,7 @@ #ifndef _DEFINES_H #define _DEFINES_H -/* $Id: defines.h,v 1.139 2007/03/26 16:35:28 tim Exp $ */ +/* $Id: defines.h,v 1.140 2007/04/29 04:39:03 dtucker Exp $ */ /* Constants */ @@ -68,7 +68,7 @@ enum # endif #endif -#ifndef MAXSYMLINKS +#if defined(HAVE_DECL_MAXSYMLINKS) && HAVE_DECL_MAXSYMLINKS == 0 # define MAXSYMLINKS 5 #endif |