diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2006-09-29 20:16:31 +1000 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2006-09-29 20:16:31 +1000 |
| commit | a4ce883a4b088a67e98aa6515fbb5fc0f959f36c (patch) | |
| tree | 639c018be4e104cbca6fe732bb36a36191ea60fc | |
| parent | 853e1535a77bfff114ce73a86da5e1808df5fb93 (diff) | |
- (dtucker) [configure.ac] Bug #1239: Fix configure test for OpenSSH engine
support. Patch from andrew.benham at thus net.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | configure.ac | 6 |
2 files changed, 8 insertions, 4 deletions
@@ -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 @@ -5493,4 +5497,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.4558.2.4 2006/09/28 09:40:55 dtucker Exp $ +$Id: ChangeLog,v 1.4558.2.5 2006/09/29 10:16:31 dtucker Exp $ diff --git a/configure.ac b/configure.ac index cfcd0272..17a34863 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.367.2.1 2006/09/29 10:16:31 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.367.2.1 $) 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, |