patch 8.0.1392: build fails with --with-features=huge --disable-channel

Problem:    Build fails with --with-features=huge --disable-channel.
Solution:   Don't enable the terminal feature when the channel feature is
            missing. (Dominique Pelle, closes #2453)

diff --git a/src/auto/configure b/src/auto/configure
index 208032ad6b4e989508b500c1794dbdbb1dba7000..fd73e92d05fc62a308b8d2fd987f835c363ea811 100755 (executable)
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -7514,7 +7514,7 @@ $as_echo "defaulting to no" >&6; }
 $as_echo "no" >&6; }
   fi
 fi
-if test "$enable_terminal" = "yes"; then
+if test "$enable_terminal" = "yes" -a "$enable_channel" = "yes"; then
   $as_echo "#define FEAT_TERMINAL 1" >>confdefs.h
 
   TERM_SRC="libvterm/src/encoding.c libvterm/src/keyboard.c libvterm/src/mouse.c libvterm/src/parser.c libvterm/src/pen.c libvterm/src/screen.c libvterm/src/state.c libvterm/src/unicode.c libvterm/src/vterm.c"

diff --git a/src/configure.ac b/src/configure.ac
index d08986ed9801261cc7b6214e802952f28415875d..0883cb7d872ef5b9e33f8fc3fa18a66884ff9dc5 100644 (file)
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -2059,7 +2059,7 @@ else
     AC_MSG_RESULT(no)
   fi
 fi
-if test "$enable_terminal" = "yes"; then
+if test "$enable_terminal" = "yes" -a "$enable_channel" = "yes"; then
   AC_DEFINE(FEAT_TERMINAL)
   TERM_SRC="libvterm/src/encoding.c libvterm/src/keyboard.c libvterm/src/mouse.c libvterm/src/parser.c libvterm/src/pen.c libvterm/src/screen.c libvterm/src/state.c libvterm/src/unicode.c libvterm/src/vterm.c"
   AC_SUBST(TERM_SRC)

diff --git a/src/version.c b/src/version.c
index af507e4b7c1c9257a559d66cac98fc76a05ff675..ab1f81627428ece33cf4274c44080ffa5e316a94 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -771,6 +771,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1392,
 /**/
     1391,
 /**/