[njs] Backed out changeset 37adbd4c8036, reimplemented properly.

[Sergey Kandaurov]

details:   http://hg.nginx.org/njs/rev/46ea39d059e1
branches:  
changeset: 402:46ea39d059e1
user:      Sergey Kandaurov <pluknet at nginx.com>
date:      Thu Aug 31 20:03:13 2017 +0300
description:
Backed out changeset 37adbd4c8036, reimplemented properly.

Changeset 37adbd4c8036 breaks build with bmake by introducing Gnu constructs.
Instead, make CLI compilation dependent on libedit by conditionally extending
the default target.

diffstat:

 Makefile          |  6 ------
 nxt/auto/editline |  2 ++
 2 files changed, 2 insertions(+), 6 deletions(-)

diffs (28 lines):

diff -r 37adbd4c8036 -r 46ea39d059e1 Makefile
--- a/Makefile	Thu Aug 31 18:38:34 2017 +0300
+++ b/Makefile	Thu Aug 31 20:03:13 2017 +0300
@@ -7,12 +7,6 @@ NXT_LIB =	nxt
 
 NXT_BUILDDIR =	build
 
-ifneq ($(NXT_EDITLINE_LIB),)
-default: $(NXT_BUILDDIR)/libnjs.a $(NXT_BUILDDIR)/njs
-else
-default: $(NXT_BUILDDIR)/libnjs.a
-endif
-
 $(NXT_BUILDDIR)/libnjs.a: \
 	$(NXT_LIB)/nxt_auto_config.h \
 	$(NXT_BUILDDIR)/njscript.o \
diff -r 37adbd4c8036 -r 46ea39d059e1 nxt/auto/editline
--- a/nxt/auto/editline	Thu Aug 31 18:38:34 2017 +0300
+++ b/nxt/auto/editline	Thu Aug 31 20:03:13 2017 +0300
@@ -32,6 +32,8 @@ if [ $nxt_found = yes ]; then
 
 NXT_EDITLINE_CFLAGS = $nxt_feature_incs
 NXT_EDITLINE_LIB = $nxt_feature_libs
+
+default:	njs
 END
 
 else