2 files changed, 10 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index e1c550829..1eba83b1c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 20050815
- - (tim) wrap el_end() in #ifdef USE_LIBEDIT
+ - (tim) [sftp.c] wrap el_end() in #ifdef USE_LIBEDIT
+ - (tim) [configure.ac] corrections to libedit tests. Report and patches
+   by skeleten AT shillest.net
 
 20050812
  - (djm) OpenBSD CVS Sync
@@ -2935,4 +2937,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.3872 2005/08/15 21:52:50 tim Exp $
+$Id: ChangeLog,v 1.3873 2005/08/16 00:48:40 tim Exp $
diff --git a/configure.ac b/configure.ac
index a62ee8c43..849112829 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-# $Id: configure.ac,v 1.285 2005/08/10 11:52:36 dtucker Exp $
+# $Id: configure.ac,v 1.286 2005/08/16 00:48:41 tim Exp $
 #
 # Copyright (c) 1999-2004 Damien Miller
 #
@@ -1024,15 +1024,16 @@ AC_ARG_WITH(libedit,
                         [ -lcurses ]
                 )
                 AC_MSG_CHECKING(if libedit version is compatible)
-                AC_TRY_COMPILE([#include <histedit.h>],
-                    [
+                AC_COMPILE_IFELSE(
+                    [AC_LANG_SOURCE([[
+#include <histedit.h>
 int main(void)
 {
         int i = H_SETSIZE;
         el_init("", NULL, NULL, NULL);
         exit(0);
 }
-                    ],
+                    ]])],
                     [ AC_MSG_RESULT(yes) ],
                     [ AC_MSG_RESULT(no)
                       AC_MSG_ERROR(libedit version is not compatible) ]
@@ -1066,6 +1067,7 @@ AC_ARG_WITH(audit,
                 AC_DEFINE(SSH_AUDIT_EVENTS, [], Use audit debugging module)
                 ;;
           no)
+                AC_MSG_RESULT(no)
                 ;;
           *)
                 AC_MSG_ERROR([Unknown audit module $withval])