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

   for Solaris. OK dtucker@.

diff --git a/ChangeLog b/ChangeLog
index 681143543906a04568d0a2493d270d30514eed8c..d9482c39128d9d7f7d92f4468950b36758353b7e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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

diff --git a/configure.ac b/configure.ac
index f765c7a0b4d964ad3c792d7127204865e84c0a8b..fc320dda3d97e60bf13fff3c791d42e4752d663a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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$)
 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