- (tim) [configure.ac] corrections to libedit tests. Report and patches

   by skeleten AT shillest.net

diff --git a/ChangeLog b/ChangeLog
index d559f4b60a58bc9d116acd18f2ad60b534721c2f..114e885edf6fce2cca1c10a5e80558fd022bb34c 100644 (file)
--- 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

diff --git a/configure.ac b/configure.ac
index 5eec34dc126a1028c6884234fbc112223f2cb59d..6ad8ba222716262adebb6582a549798a756d928a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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])