diff options
| author | Tim Rice <tim@multitalents.net> | 2006-02-04 17:34:55 -0800 |
|---|---|---|
| committer | Tim Rice <tim@multitalents.net> | 2006-02-04 17:34:55 -0800 |
| commit | bde717b825beca3b819a17cb813dec44a293a353 (patch) | |
| tree | fa7db8820fd6951f9e8045f82a5995b8178466f9 | |
| parent | e9d6269fc51cf153cdca40cc82c5ec188df74c17 (diff) | |
- (tim) [configure.ac] Add AC_REVISION. Add sys/time.h to lastlog.h test
for Solaris. OK dtucker@.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | configure.ac | 11 |
2 files changed, 14 insertions, 3 deletions
@@ -1,3 +1,7 @@ +20060205 + - (tim) [configure.ac] Add AC_REVISION. Add sys/time.h to lastlog.h test + for Solaris. OK dtucker@. + 20060203 - (tim) [configure.ac] test for egrep (AC_PROG_EGREP) before first AC_CHECK_HEADERS test. Without it, if AC_CHECK_HEADERS is first run @@ -3830,4 +3834,4 @@ - (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu -$Id: ChangeLog,v 1.4117.2.3 2006/02/03 03:16:11 tim Exp $ +$Id: ChangeLog,v 1.4117.2.4 2006/02/05 01:34:55 tim Exp $ diff --git a/configure.ac b/configure.ac index 20b15c62..f1cf15e8 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -# $Id: configure.ac,v 1.322.2.2 2006/02/03 03:16:11 tim Exp $ +# $Id: configure.ac,v 1.322.2.3 2006/02/05 01:34:55 tim Exp $ # # Copyright (c) 1999-2004 Damien Miller # @@ -15,6 +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.322.2.3 $) AC_CONFIG_SRCDIR([ssh.c]) AC_CONFIG_HEADER(config.h) @@ -673,7 +674,6 @@ AC_CHECK_HEADERS( \ glob.h \ ia.h \ iaf.h \ - lastlog.h \ limits.h \ login.h \ login_cap.h \ @@ -724,6 +724,13 @@ AC_CHECK_HEADERS( \ vis.h \ ) +# lastlog.h requires sys/time.h to be included first on Solaris +AC_CHECK_HEADERS(lastlog.h, [], [], [ +#ifdef HAVE_SYS_TIME_H +# include <sys/time.h> +#endif +]) + # sys/ptms.h requires sys/stream.h to be included first on Solaris AC_CHECK_HEADERS(sys/ptms.h, [], [], [ #ifdef HAVE_SYS_STREAM_H |