aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Eklöf <daniel@ekloef.se>2021-02-09 18:42:55 +0000
committerDaniel Eklöf <daniel@ekloef.se>2021-02-09 18:42:55 +0000
commitbdc5810ff45e62d73764e24ca28d72b5096c8c54 (patch)
tree0e2dc9ba29aebd6cdd4997fd5b0b6b323133e965
parentMerge branch 'refactor-key-bindings' (diff)
meson: convert -Dterminfo from a boolean to a feature option
Patch from Jan Beich
-rw-r--r--.builds/freebsd-x64.yml4
-rw-r--r--doc/foot.ini.5.scd2
-rw-r--r--foot.ini2
-rw-r--r--meson_options.txt2
4 files changed, 5 insertions, 5 deletions
diff --git a/.builds/freebsd-x64.yml b/.builds/freebsd-x64.yml
index 8147184e..d14ae645 100644
--- a/.builds/freebsd-x64.yml
+++ b/.builds/freebsd-x64.yml
@@ -28,11 +28,11 @@ sources:
tasks:
- debug: |
mkdir -p bld/debug
- meson --buildtype=debug -Dterminfo=false -Dfcft:text-shaping=enabled -Dfcft:test-text-shaping=true foot bld/debug
+ meson --buildtype=debug -Dterminfo=disabled -Dfcft:text-shaping=enabled -Dfcft:test-text-shaping=true foot bld/debug
ninja -C bld/debug -k0
meson test -C bld/debug --print-errorlogs
- release: |
mkdir -p bld/release
- meson --buildtype=minsize -Dterminfo=false -Dfcft:text-shaping=enabled -Dfcft:test-text-shaping=true foot bld/release
+ meson --buildtype=minsize -Dterminfo=disabled -Dfcft:text-shaping=enabled -Dfcft:test-text-shaping=true foot bld/release
ninja -C bld/release -k0
meson test -C bld/release --print-errorlogs
diff --git a/doc/foot.ini.5.scd b/doc/foot.ini.5.scd
index 5bf9bbf5..cb1f1c32 100644
--- a/doc/foot.ini.5.scd
+++ b/doc/foot.ini.5.scd
@@ -30,7 +30,7 @@ in this order:
*term*
Value to set the environment variable *TERM* to. Default: _foot_
- or _xterm-256color_ if built with _-Dterminfo=false_
+ or _xterm-256color_ if built with _-Dterminfo=disabled_
*font*, *font-bold*, *font-italic*, *font-bold-italic*
Comma separated list of fonts to use, in fontconfig format. That
diff --git a/foot.ini b/foot.ini
index 8896eef0..062162f7 100644
--- a/foot.ini
+++ b/foot.ini
@@ -1,7 +1,7 @@
# -*- conf -*-
# shell=$SHELL (if set, otherwise user's default shell from /etc/passwd)
-# term=foot (or xterm-256color if built with -Dterminfo=false)
+# term=foot (or xterm-256color if built with -Dterminfo=disabled)
# login-shell=no
# font=monospace:size=8
diff --git a/meson_options.txt b/meson_options.txt
index 0a5b0a3d..b21bc7a4 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,2 +1,2 @@
option('ime', type: 'boolean', value: true, description: 'IME (Input Method Editor) support')
-option('terminfo', type: 'boolean', value: true, description: 'Install terminfo')
+option('terminfo', type: 'feature', description: 'Install terminfo')