2 files changed, 9 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 128057cbf..d3077fbda 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+20060804
+ - (dtucker) [configure.ac] The "crippled AES" test does not work on recent
+   versions of Solaris, so use AC_LINK_IFELSE to actually link the test program
+   rather than just compiling it.  Spotted by dlg@.
+
 20060802
  - (dtucker) [openbsd-compat/daemon.c] Add unistd.h for fork() prototype.
 
@@ -5062,4 +5067,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.4440 2006/08/02 13:33:54 dtucker Exp $
+$Id: ChangeLog,v 1.4441 2006/08/04 09:44:23 dtucker Exp $
diff --git a/configure.ac b/configure.ac
index 3373dadc7..31dac052e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.347 2006/07/12 09:02:57 dtucker Exp $
+# $Id: configure.ac,v 1.348 2006/08/04 09:44:23 dtucker Exp $
 #
 # Copyright (c) 1999-2004 Damien Miller
 #
@@ -15,7 +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.347 $)
+AC_REVISION($Revision: 1.348 $)
 AC_CONFIG_SRCDIR([ssh.c])
 
 AC_CONFIG_HEADER(config.h)
@@ -1892,7 +1892,7 @@ int main(void){ENGINE_load_builtin_engines();ENGINE_register_all_complete();}
 
 # Check for OpenSSL without EVP_aes_{192,256}_cbc
 AC_MSG_CHECKING([whether OpenSSL has crippled AES support])
-AC_COMPILE_IFELSE(
+AC_LINK_IFELSE(
         [AC_LANG_SOURCE([[
 #include <string.h>
 #include <openssl/evp.h>