diff --git a/mu4e/meson.build b/mu4e/meson.build index a2a22bbd7..9fb00e669 100644 --- a/mu4e/meson.build +++ b/mu4e/meson.build @@ -16,14 +16,20 @@ # generate some build data for use in mu4e +version_extra='' +if get_option('xapian-single-threaded') + version_extra='-st' +endif + mu4e_meta = configure_file( input: 'mu4e-config.el.in', output: 'mu4e-config.el', install: true, install_dir: mu4e_lispdir, configuration: { - 'VERSION' : meson.project_version(), - 'MU_DOC_DIR' : join_paths(datadir, 'doc', 'mu'), + 'VERSION' : meson.project_version(), + 'MU_VERSION_EXTRA' : version_extra, + 'MU_DOC_DIR' : join_paths(datadir, 'doc', 'mu'), }) mu4e_pkg_desc = configure_file( diff --git a/mu4e/mu4e-config.el.in b/mu4e/mu4e-config.el.in index 5f99db426..170b411fa 100644 --- a/mu4e/mu4e-config.el.in +++ b/mu4e/mu4e-config.el.in @@ -3,6 +3,9 @@ (defconst mu4e-mu-version "@VERSION@" "Required mu binary version; mu4e's version must agree with this.") +(defconst mu-version-extra "@MU_VERSION_EXTRA@" + "Suffix to version (in display).") + (defconst mu4e-doc-dir "@MU_DOC_DIR@" "Mu4e's data-dir.") diff --git a/mu4e/mu4e-main.el b/mu4e/mu4e-main.el index ffe22a583..c52b68671 100644 --- a/mu4e/mu4e-main.el +++ b/mu4e/mu4e-main.el @@ -1,6 +1,6 @@ ;;; mu4e-main.el --- The Main interface for mu4e -*- lexical-binding: t -*- -;; Copyright (C) 2011-2023 Dirk-Jan C. Binnema +;; Copyright (C) 2011-2024 Dirk-Jan C. Binnema ;; Author: Dirk-Jan C. Binnema ;; Maintainer: Dirk-Jan C. Binnema @@ -299,7 +299,8 @@ Otherwise, do nothing." "* " (propertize "mu4e" 'face 'mu4e-header-key-face) (propertize " - mu for emacs version " 'face 'mu4e-title-face) - (propertize mu4e-mu-version 'face 'mu4e-header-key-face) + (propertize (concat mu4e-mu-version mu-version-extra) + 'face 'mu4e-header-key-face) "\n\n" (propertize " Basics\n\n" 'face 'mu4e-title-face) (mu4e--main-action