- (dtucker) [configure.ac] Bug #1239: Fix configure test for OpenSSH engine

   support.  Patch from andrew.benham at thus net.

2 files changed, 8 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index e70288d9b..ecd6c61e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+20060929
+ - (dtucker) [configure.ac] Bug #1239: Fix configure test for OpenSSH engine
+   support.  Patch from andrew.benham at thus net.
+
 20060928
  - (dtucker) [entropy.c] Bug #1238: include signal.h to fix compilation error
    on Solaris 8 w/out /dev/random or prngd.  Patch from rl at
@@ -2502,4 +2506,4 @@
    OpenServer 6 and add osr5bigcrypt support so when someone migrates
    passwords between UnixWare and OpenServer they will still work. OK dtucker@
 
-$Id: ChangeLog,v 1.4563 2006/09/28 09:40:20 dtucker Exp $
+$Id: ChangeLog,v 1.4564 2006/09/29 10:16:51 dtucker Exp $
diff --git a/configure.ac b/configure.ac
index cfcd0272d..883708559 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.367 2006/09/24 19:08:59 tim Exp $
+# $Id: configure.ac,v 1.368 2006/09/29 10:16:51 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.367 $)
+AC_REVISION($Revision: 1.368 $)
 AC_CONFIG_SRCDIR([ssh.c])
 
 AC_CONFIG_HEADER(config.h)
@@ -1916,7 +1916,7 @@ AC_ARG_WITH(ssl-engine,
                 AC_TRY_COMPILE(
                         [ #include <openssl/engine.h>],
                         [
-int main(void){ENGINE_load_builtin_engines();ENGINE_register_all_complete();}
+ENGINE_load_builtin_engines();ENGINE_register_all_complete();
                         ],
                         [ AC_MSG_RESULT(yes)
                           AC_DEFINE(USE_OPENSSL_ENGINE, 1,