summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--configure.ac11
2 files changed, 14 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 5e33dc517..8464c7c45 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
120060205
2 - (tim) [configure.ac] Add AC_REVISION. Add sys/time.h to lastlog.h test
3 for Solaris. OK dtucker@.
4
120060203 520060203
2 - (tim) [configure.ac] test for egrep (AC_PROG_EGREP) before first 6 - (tim) [configure.ac] test for egrep (AC_PROG_EGREP) before first
3 AC_CHECK_HEADERS test. Without it, if AC_CHECK_HEADERS is first run 7 AC_CHECK_HEADERS test. Without it, if AC_CHECK_HEADERS is first run
@@ -3830,4 +3834,4 @@
3830 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 3834 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
3831 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 3835 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
3832 3836
3833$Id: ChangeLog,v 1.4117.2.3 2006/02/03 03:16:11 tim Exp $ 3837$Id: ChangeLog,v 1.4117.2.4 2006/02/05 01:34:55 tim Exp $
diff --git a/configure.ac b/configure.ac
index 20b15c622..f1cf15e8c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
1# $Id: configure.ac,v 1.322.2.2 2006/02/03 03:16:11 tim Exp $ 1# $Id: configure.ac,v 1.322.2.3 2006/02/05 01:34:55 tim Exp $
2# 2#
3# Copyright (c) 1999-2004 Damien Miller 3# Copyright (c) 1999-2004 Damien Miller
4# 4#
@@ -15,6 +15,7 @@
15# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. 15# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
16 16
17AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org) 17AC_INIT(OpenSSH, Portable, openssh-unix-dev@mindrot.org)
18AC_REVISION($Revision: 1.322.2.3 $)
18AC_CONFIG_SRCDIR([ssh.c]) 19AC_CONFIG_SRCDIR([ssh.c])
19 20
20AC_CONFIG_HEADER(config.h) 21AC_CONFIG_HEADER(config.h)
@@ -673,7 +674,6 @@ AC_CHECK_HEADERS( \
673 glob.h \ 674 glob.h \
674 ia.h \ 675 ia.h \
675 iaf.h \ 676 iaf.h \
676 lastlog.h \
677 limits.h \ 677 limits.h \
678 login.h \ 678 login.h \
679 login_cap.h \ 679 login_cap.h \
@@ -724,6 +724,13 @@ AC_CHECK_HEADERS( \
724 vis.h \ 724 vis.h \
725) 725)
726 726
727# lastlog.h requires sys/time.h to be included first on Solaris
728AC_CHECK_HEADERS(lastlog.h, [], [], [
729#ifdef HAVE_SYS_TIME_H
730# include <sys/time.h>
731#endif
732])
733
727# sys/ptms.h requires sys/stream.h to be included first on Solaris 734# sys/ptms.h requires sys/stream.h to be included first on Solaris
728AC_CHECK_HEADERS(sys/ptms.h, [], [], [ 735AC_CHECK_HEADERS(sys/ptms.h, [], [], [
729#ifdef HAVE_SYS_STREAM_H 736#ifdef HAVE_SYS_STREAM_H