Skipping expect tests if libedit is not available.

diff --git a/nxt/auto/editline b/nxt/auto/editline
index 101693a6d780528705969813444d4fbaafdd8763..68ad9da7fa428ee68378104cb25353909302e726 100644 (file)
--- a/nxt/auto/editline
+++ b/nxt/auto/editline
@@ -28,6 +28,7 @@ if [ $nxt_found = no ]; then
 fi
 
 if [ $nxt_found = yes ]; then
+    NXT_HAVE_LIBEDIT=YES
     cat << END >> $NXT_MAKEFILE_CONF
 
 NXT_EDITLINE_CFLAGS = $nxt_feature_incs
@@ -37,6 +38,7 @@ default:      njs
 END
 
 else
+    NXT_HAVE_LIBEDIT=NO
     $nxt_echo " - building interactive shell is not possible"
 
     cat << END >> $NXT_MAKEFILE_CONF

diff --git a/nxt/auto/expect b/nxt/auto/expect
index b924bbd56d26c141c26b2a8ca34bfb541494eb25..12652cd9d49bce407b7caa92065aad0a918881c0 100644 (file)
--- a/nxt/auto/expect
+++ b/nxt/auto/expect
@@ -12,6 +12,12 @@ fi
 if [ $nxt_found = yes ]; then
     $nxt_echo " found"
     $nxt_echo " + Expect version: `expect -v`"
+
+else
+    $nxt_echo " not found"
+fi
+
+if [ $nxt_found = yes -a $NXT_HAVE_LIBEDIT = YES ]; then
     cat << END >> $NXT_MAKEFILE_CONF
 
 njs_expect_test:       njs njs/test/njs_expect_test.exp
@@ -19,7 +25,6 @@ njs_expect_test:      njs njs/test/njs_expect_test.exp
 END
 
 else
-    $nxt_echo " not found"
     $nxt_echo " - expect tests are disabled"
 
     cat << END >> $NXT_MAKEFILE_CONF