- (tim) [configure.ac] Add AC_REVISION. Add sys/time.h to lastlog.h test

for Solaris. OK dtucker@.
This commit is contained in:
Tim Rice 2006-02-04 17:33:55 -08:00
parent fd80ddcb23
commit 0daad78fab
2 changed files with 14 additions and 3 deletions

View File

@ -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.4120 2006/02/03 03:11:56 tim Exp $
$Id: ChangeLog,v 1.4121 2006/02/05 01:33:55 tim Exp $

View File

@ -1,4 +1,4 @@
# $Id: configure.ac,v 1.324 2006/02/03 03:11:56 tim Exp $
# $Id: configure.ac,v 1.325 2006/02/05 01:33: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.325 $)
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