Shell: removed support for building with GNU readline.

diff --git a/auto/readline b/auto/readline
index 505e11e403bf3edb7e86b68cf19a03226c0d75da..6a13e6cb751b6b799450a5d2ec8fa8551644d81c 100644 (file)
--- 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 bd91c467a7e64ca12eb66f5794082595797061c1..d3aec0884485868bf7accb00f7519161daf1832a 100644 (file)
--- 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