2 files changed, 12 insertions, 3 deletions

diff --git a/ChangeLog b/ChangeLog
index a70207b60..964abb810 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20020705
+ - (tim) [configure.ac] AIX 4.2.1 has authenticate() in libs.
+   Reported by Darren Tucker <dtucker@zip.com.au>
+
 20020704
  - (bal) Limit data to TTY for AIX only (Newer versions can't handle the
    faster data rate)  Bug #124
@@ -1274,4 +1278,4 @@
  - (stevesk) entropy.c: typo in debug message
  - (djm) ssh-keygen -i needs seeded RNG; report from markus@
 
-$Id: ChangeLog,v 1.2335 2002/07/04 19:33:49 mouring Exp $
+$Id: ChangeLog,v 1.2336 2002/07/05 14:12:33 tim Exp $
diff --git a/configure.ac b/configure.ac
index 7ef77e5b1..4b48be389 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.73 2002/06/28 00:37:33 mouring Exp $
+# $Id: configure.ac,v 1.74 2002/07/05 14:12:34 tim Exp $
 
 AC_INIT
 AC_CONFIG_SRCDIR([ssh.c])
@@ -71,7 +71,12 @@ case "$host" in
                 )
                 LDFLAGS="$saved_LDFLAGS"
         fi
-        AC_CHECK_FUNC(authenticate, [AC_DEFINE(WITH_AIXAUTHENTICATE)])
+        AC_CHECK_FUNC(authenticate, [AC_DEFINE(WITH_AIXAUTHENTICATE)],
+                [AC_CHECK_LIB(s,authenticate,
+                        [ AC_DEFINE(WITH_AIXAUTHENTICATE)
+                                LIBS="$LIBS -ls"
+                        ])
+                ])
         AC_DEFINE(BROKEN_GETADDRINFO)
         AC_DEFINE(BROKEN_REALPATH)
         dnl AIX handles lastlog as part of its login message