patch 8.0.1235: cannot disable the terminal feature in a huge build

Problem:    Cannot disable the terminal feature in a huge build. (lindhobe)
Solution:   Adjust the autoconf check. (Kazunobu Kuriyama, closes #2242)

diff --git a/src/Makefile b/src/Makefile
index 75e528e12d6fb23c928c8ee9381a34185a492af7..bda65abe486b5eae768505d87c46b58526c07f5e 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -340,7 +340,7 @@ CClink = $(CC)
 # When both GTK+ 2 and GTK+ 3 are possible then GTK+ 2 will be selected.
 # To use GTK+ 3 instead use --enable-gui=gtk3 (see below).
 #CONF_OPT_GUI = --disable-gtk2-check
-#CONF_OPT_GUI = --enable-gnome2-check
+#CONF_OPT_GUI = --enable-gnome-check
 #CONF_OPT_GUI = --disable-gtk3-check
 #CONF_OPT_GUI = --disable-motif-check
 #CONF_OPT_GUI = --disable-athena-check
@@ -483,9 +483,12 @@ CClink = $(CC)
 #CONF_OPT_CHANNEL = --disable-channel
 
 # TERMINAL - Terminal emulator support, :terminal command.  Requires the
-# channel feature.
-# Uncomment this when you want terminal emulator support.
+# channel feature. The default is enable for when using "huge" features.
+# Uncomment the first line when you want terminal emulator support for
+# not-huge builds.  Uncomment the second line when you don't want terminal
+# emulator support in the huge build.
 #CONF_OPT_TERMINAL = --enable-terminal
+#CONF_OPT_TERMINAL = --disable-terminal
 
 # MULTIBYTE - To edit multi-byte characters.
 # Uncomment this when you want to edit a multibyte language.

diff --git a/src/auto/configure b/src/auto/configure
index 4ee62b371778402912b2e15351e04ee631330de3..fa9276a1368fbc8c89cf75e9a2199dafa5a9dac8 100755 (executable)
--- a/src/auto/configure
+++ b/src/auto/configure
@@ -7475,7 +7475,7 @@ fi
 $as_echo_n "checking --enable-terminal argument... " >&6; }
 # Check whether --enable-terminal was given.
 if test "${enable_terminal+set}" = set; then :
-  enableval=$enable_terminal; enable_terminal="yes"
+  enableval=$enable_terminal;
 else
   enable_terminal="auto"
 fi

diff --git a/src/configure.ac b/src/configure.ac
index f4650962bbe6c4406ecc092d82125679c72ddbe8..2185c9e889a8096d8c0c6794ac18c659a0686a4a 100644 (file)
--- a/src/configure.ac
+++ b/src/configure.ac
@@ -2035,7 +2035,7 @@ fi
 AC_MSG_CHECKING(--enable-terminal argument)
 AC_ARG_ENABLE(terminal,
        [  --enable-terminal       Enable terminal emulation support.],
-       [enable_terminal="yes"], [enable_terminal="auto"])
+       , [enable_terminal="auto"])
 if test "$enable_terminal" = "yes" || test "$enable_terminal" = "auto" -a "x$features" = "xhuge" ; then
   if test "x$features" = "xtiny" -o "x$features" = "xsmall"; then
     AC_MSG_RESULT([cannot use terminal emulator with tiny or small features])

diff --git a/src/version.c b/src/version.c
index 24557e38765b85aace328c1dd86200f2e56e7f35..60ea4f37c7e68a49e110315d0cfeeebcbab7df1a 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -761,6 +761,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1235,
 /**/
     1234,
 /**/