From: Sergey Kandaurov <pluknet@nginx.com>
Date: Thu, 31 Aug 2017 17:03:13 +0000 (+0300)
Subject: Backed out changeset 37adbd4c8036, reimplemented properly.
X-Git-Tag: 0.1.13~2
X-Git-Url: http://git.kaiwu.me/%7B@url%7D?a=commitdiff_plain;h=554a96bf68b50c1b3c832bf77ac5a526a485dd98;p=njs.git

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.
---

diff --git a/Makefile b/Makefile
index a90cafde..01ed2c2f 100644
--- a/Makefile
+++ b/Makefile
@@ -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 --git a/nxt/auto/editline b/nxt/auto/editline
index c7c6b91b..55947e19 100644
--- a/nxt/auto/editline
+++ b/nxt/auto/editline
@@ -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