Do "readline" on NetBSD.

bk: 3f34d73dTm4GfTMtwj4T3tIBNn2e7Q

diff --git a/configure.in b/configure.in
index 7b7eccd9d3096dc84b2a5faf3b5879a519430e16..447ab7964899fa8cfde319734dc79755e34a743c 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -220,8 +220,13 @@ case "$ac_cv_header_readline_history_h$ac_cv_header_readline_readline_h" in
      AC_CHECK_LIB(readline, readline,
       LIBS="-lreadline -lcurses $LIBS"
       AC_DEFINE(HAVE_LIBREADLINE)
-      AC_DEFINE(HAVE_LIBCURSES, , [Do we have the curses library?])
-      , , -lcurses))
+      AC_DEFINE(HAVE_LIBCURSES, , [Do we have the curses library?]),
+      AC_CHECK_LIB(edit, readline,
+       LIBS="-ledit -lcurses"
+       AC_DEFINE(HAVE_LIBEDIT, , [Do we have the edit library?])
+       AC_DEFINE(HAVE_LIBCURSES, , [Do we have the curses library?])
+       , , -lcurses)
+      , -lcurses))
     READLINE_LIBS=$LIBS
     AC_SUBST(READLINE_LIBS)
     LIBS=$save_LIBS

diff --git a/ntpdc/ntpdc.c b/ntpdc/ntpdc.c
index 294b88da2dbcc6b493113f7b260404beaf3033fc..a3dac407702170bd06fb549b5acdf8926190d632 100644 (file)
--- a/ntpdc/ntpdc.c
+++ b/ntpdc/ntpdc.c
@@ -24,10 +24,10 @@
 # define closesocket close
 #endif /* SYS_WINNT */
 
-#ifdef HAVE_LIBREADLINE
+#if defined(HAVE_LIBREADLINE) || defined (HAVE_LIBEDIT)
 # include <readline/readline.h>
 # include <readline/history.h>
-#endif /* HAVE_LIBREADLINE */
+#endif /* HAVE_LIBREADLINE || HAVE_LIBEDIT */
 
 #ifdef SYS_VXWORKS
 /* vxWorks needs mode flag -casey*/
@@ -1042,7 +1042,7 @@ again:
 static void
 getcmds(void)
 {
-#ifdef HAVE_LIBREADLINE
+#if defined(HAVE_LIBREADLINE) || defined(HAVE_LIBEDIT)
        char *line;
 
        for (;;) {
@@ -1051,7 +1051,7 @@ getcmds(void)
                docmd(line);
                free(line);
        }
-#else /* not HAVE_LIBREADLINE */
+#else /* not (HAVE_LIBREADLINE || HAVE_LIBEDIT) */
        char line[MAXLINE];
 
        for (;;) {
@@ -1068,7 +1068,7 @@ getcmds(void)
 
                docmd(line);
        }
-#endif /* not HAVE_LIBREADLINE */
+#endif /* not HAVE_LIBREADLINE || HAVE_LIBEDIT */
 }
 
 

diff --git a/ntpq/ntpq.c b/ntpq/ntpq.c
index e45a4af74827fd1bebe20f9f9ffd6756fb75a9f6..62c2717dc17c31d8f1388cdfb18b3d1fa0b96bcc 100644 (file)
--- a/ntpq/ntpq.c
+++ b/ntpq/ntpq.c
@@ -27,10 +27,10 @@
 #define closesocket close
 #endif /* SYS_WINNT */
 
-#ifdef HAVE_LIBREADLINE
+#if defined(HAVE_LIBREADLINE) || defined(HAVE_LIBEDIT)
 # include <readline/readline.h>
 # include <readline/history.h>
-#endif /* HAVE_LIBREADLINE */
+#endif /* HAVE_LIBREADLINE || HAVE_LIBEDIT */
 
 #ifdef SYS_VXWORKS
 /* vxWorks needs mode flag -casey*/
@@ -1324,7 +1324,7 @@ doquery(
 static void
 getcmds(void)
 {
-#ifdef HAVE_LIBREADLINE
+#if defined(HAVE_LIBREADLINE) || defined(HAVE_LIBEDIT)
         char *line;
 
         for (;;) {
@@ -1333,7 +1333,7 @@ getcmds(void)
                 docmd(line);
                 free(line);
         }
-#else /* not HAVE_LIBREADLINE */
+#else /* not (HAVE_LIBREADLINE || HAVE_LIBEDIT) */
         char line[MAXLINE];
 
         for (;;) {
@@ -1350,7 +1350,7 @@ getcmds(void)
 
                 docmd(line);
         }
-#endif /* not HAVE_LIBREADLINE */
+#endif /* not (HAVE_LIBREADLINE || HAVE_LIBEDIT) */
 }
 
 #ifndef SYS_WINNT /* Under NT cannot handle SIGINT, WIN32 spawns a handler */