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 a90cafde48ddb0b2108e801fc7937ca25c04d41b..01ed2c2fdf4053845acd02e9ad679eb8b55f1439 100644 (file)
--- 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 c7c6b91b4e3b9fc7e4fa1713c9eb67d00e49b479..55947e199a4bb0fea8251ff4703676a62efbb72b 100644 (file)
--- 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