From: James Hilliard Date: Sun, 11 Jul 2021 10:39:33 +0000 (-0600) Subject: Add meson option to disable urlify. X-Git-Tag: v250-rc1~944 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e5d86ebed5624ef62342c820a5868b1075deb300;p=thirdparty%2Fsystemd.git Add meson option to disable urlify. Useful for systems that don't use a version of less with hyperlink support. --- diff --git a/meson.build b/meson.build index 5735cfc7ada..a2ee15bf320 100644 --- a/meson.build +++ b/meson.build @@ -278,6 +278,7 @@ conf.set_quoted('USER_PRESET_DIR', userpresetdir) conf.set_quoted('VENDOR_KEYRING_PATH', join_paths(rootlibexecdir, 'import-pubring.gpg')) conf.set('ANSI_OK_COLOR', 'ANSI_' + get_option('ok-color').underscorify().to_upper()) +conf.set10('ENABLE_URLIFY', get_option('urlify')) conf.set10('ENABLE_FEXECVE', get_option('fexecve')) conf.set10('MEMORY_ACCOUNTING_DEFAULT', memory_accounting_default) conf.set('STATUS_UNIT_FORMAT_DEFAULT', 'STATUS_UNIT_FORMAT_' + status_unit_format_default.to_upper()) diff --git a/meson_options.txt b/meson_options.txt index 163c8df87db..b60261ac24e 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -444,6 +444,8 @@ option('ok-color', type : 'combo', 'highlight-cyan', 'highlight-white'], value : 'green', description: 'color of the "OK" status message') +option('urlify', type : 'boolean', value : 'true', + description : 'enable pager Hyperlink ANSI sequence support') option('fexecve', type : 'boolean', value : 'false', description : 'use fexecve() to spawn children') diff --git a/src/shared/pretty-print.c b/src/shared/pretty-print.c index 137ba77b3a6..7983c0a33af 100644 --- a/src/shared/pretty-print.c +++ b/src/shared/pretty-print.c @@ -19,6 +19,7 @@ #include "util.h" bool urlify_enabled(void) { +#if ENABLE_URLIFY static int cached_urlify_enabled = -1; if (cached_urlify_enabled < 0) { @@ -32,6 +33,9 @@ bool urlify_enabled(void) { } return cached_urlify_enabled; +#else + return 0; +#endif } int terminal_urlify(const char *url, const char *text, char **ret) {