From: Dmitry Volyntsev <xeioex@nginx.com>
Date: Sat, 20 May 2023 03:22:16 +0000 (-0700)
Subject: Shell: removed support for building with GNU readline.
X-Git-Url: http://www.kaiwu.me/postgresql/commit/static/gitweb.js?a=commitdiff_plain;h=7ead5d7da92efa0057659258138db19a76d37cee;p=njs.git

Shell: removed support for building with GNU readline.
---

diff --git a/auto/readline b/auto/readline
index 505e11e4..6a13e6cb 100644
--- a/auto/readline
+++ b/auto/readline
@@ -6,14 +6,13 @@ NJS_READLINE_LIB=
 
 njs_found=no
 
-njs_feature="GNU readline library"
-njs_feature_name=NJS_HAVE_GNU_READLINE
+njs_feature="editline library in editline/readline.h"
 njs_feature_run=no
 njs_feature_incs=
-njs_feature_libs="-lreadline"
+njs_feature_name=NJS_HAVE_EDITLINE
+njs_feature_libs="-ledit"
 njs_feature_test="#include <stdio.h>
-                  #include <readline/readline.h>
-                  #include <readline/history.h>
+                  #include <editline/readline.h>
 
                   int main(void) {
                       add_history(NULL);
@@ -21,20 +20,6 @@ njs_feature_test="#include <stdio.h>
                   }"
 . auto/feature
 
-if [ $njs_found = no ]; then
-    njs_feature="editline library in editline/readline.h"
-    njs_feature_name=NJS_HAVE_EDITLINE
-    njs_feature_libs="-ledit"
-    njs_feature_test="#include <stdio.h>
-                      #include <editline/readline.h>
-
-                      int main(void) {
-                          add_history(NULL);
-                          return 0;
-                      }"
-    . auto/feature
-fi
-
 if [ $njs_found = no ]; then
 
     # FreeBSD port
diff --git a/external/njs_shell.c b/external/njs_shell.c
index bd91c467..d3aec088 100644
--- a/external/njs_shell.c
+++ b/external/njs_shell.c
@@ -25,9 +25,6 @@
 #include <edit/readline/readline.h>
 #else
 #include <readline/readline.h>
-#if (NJS_HAVE_GNU_READLINE)
-#include <readline/history.h>
-#endif
 #endif
 
 #endif