summaryrefslogtreecommitdiffstats
path: root/src/Makefile
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-10-28 20:28:23 +0200
committerBram Moolenaar <Bram@vim.org>2017-10-28 20:28:23 +0200
commitef83956e1e67736b4c6b886d897b74f022622a74 (patch)
tree7f3a9843323ccadb416d2ee3a8fda8170517f6b8 /src/Makefile
parenta6ce1ccf5c10baa5c2a25897c46961d751a21dda (diff)
patch 8.0.1235: cannot disable the terminal feature in a huge buildv8.0.1235
Problem: Cannot disable the terminal feature in a huge build. (lindhobe) Solution: Adjust the autoconf check. (Kazunobu Kuriyama, closes #2242)
Diffstat (limited to 'src/Makefile')
-rw-r--r--src/Makefile9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/Makefile b/src/Makefile
index 75e528e12d..bda65abe48 100644
--- 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.