- (bal) Missed part of the UNIX sockets patch. Patch by Corinna

   Vinschen <vinschen@redhat.com>
 - (bal) Reorder where 'strftime' is detected to resolve linking
   issues on SCO.  Patch by Tim Rice <tim@multitalents.net>

3 files changed, 14 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 32c97f4a0..1ac4eb040 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
 20010224
+ - (bal) Missed part of the UNIX sockets patch.  Patch by Corinna 
+   Vinschen <vinschen@redhat.com>
+ - (bal) Reorder where 'strftime' is detected to resolve linking
+   issues on SCO.  Patch by Tim Rice <tim@multitalents.net>
+
+20010224
  - (bal) pam_stack fix to correctly detect between RH7 and older RHs.
    Patch by Pekka Savola <pekkas@netcore.fi>
  - (bal) Renamed sigaction.[ch] to sigact.[ch].  Causes problems with
@@ -4114,4 +4120,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.818 2001/02/24 00:55:04 mouring Exp $
+$Id: ChangeLog,v 1.819 2001/02/24 21:41:10 mouring Exp $
diff --git a/acconfig.h b/acconfig.h
index d27153476..01dfb4b6d 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -1,4 +1,4 @@
-/* $Id: acconfig.h,v 1.102 2001/02/18 06:01:00 djm Exp $ */
+/* $Id: acconfig.h,v 1.103 2001/02/24 21:41:10 mouring Exp $ */
 
 #ifndef _CONFIG_H
 #define _CONFIG_H
@@ -293,6 +293,9 @@
 /* Define if you have BSD auth support */
 #undef BSD_AUTH
 
+/* Define if X11 doesn't support AF_UNIX sockets on that system */
+#undef NO_X11_UNIX_SOCKETS
+
 @BOTTOM@
 
 /* ******************* Shouldn't need to edit below this line ************** */
diff --git a/configure.in b/configure.in
index e236fa491..4ed1eb7c5 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-# $Id: configure.in,v 1.252 2001/02/24 00:55:05 mouring Exp $
+# $Id: configure.in,v 1.253 2001/02/24 21:41:11 mouring Exp $
 
 AC_INIT(ssh.c)
 
@@ -358,6 +358,8 @@ AC_CHECK_FUNC(utimes,
         [], [ AC_CHECK_LIB(c89, utimes, LIBS="$LIBS -lc89") ]
 )
 
+AC_FUNC_STRFTIME
+
 # Checks for header files.
 AC_CHECK_HEADERS(bstring.h endian.h floatingpoint.h getopt.h lastlog.h limits.h login.h login_cap.h maillock.h netdb.h netgroup.h netinet/in_systm.h paths.h poll.h pty.h regex.h shadow.h security/pam_appl.h sys/bitypes.h sys/bsdtty.h sys/cdefs.h sys/poll.h sys/queue.h sys/select.h sys/stat.h sys/stropts.h sys/sysmacros.h sys/time.h sys/ttcompat.h sys/un.h stddef.h time.h ttyent.h usersec.h util.h utime.h utmp.h utmpx.h vis.h)
 
@@ -534,8 +536,6 @@ fi
 
 AC_FUNC_GETPGRP
 
-AC_FUNC_STRFTIME
-
 # Check for PAM libs
 PAM_MSG="no"
 AC_ARG_WITH(pam,