[njs] Shell: removed support for building with GNU readline.

Dmitry Volyntsev xeioex at nginx.com
Sat May 20 04:31:06 UTC 2023


details:   https://hg.nginx.org/njs/rev/9b4d3514d68d
branches:  
changeset: 2127:9b4d3514d68d
user:      Dmitry Volyntsev <xeioex at nginx.com>
date:      Fri May 19 20:22:16 2023 -0700
description:
Shell: removed support for building with GNU readline.

diffstat:

 auto/readline        |  23 ++++-------------------
 external/njs_shell.c |   3 ---
 2 files changed, 4 insertions(+), 22 deletions(-)

diffs (56 lines):

diff -r 5889afe2a4b7 -r 9b4d3514d68d auto/readline
--- a/auto/readline	Fri May 19 20:22:16 2023 -0700
+++ b/auto/readline	Fri May 19 20:22:16 2023 -0700
@@ -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);
@@ -22,20 +21,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 -r 5889afe2a4b7 -r 9b4d3514d68d external/njs_shell.c
--- a/external/njs_shell.c	Fri May 19 20:22:16 2023 -0700
+++ b/external/njs_shell.c	Fri May 19 20:22:16 2023 -0700
@@ -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


More information about the nginx-devel mailing list