From b3043a2df18f24209a98047edc2d7638a5c89de6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 1 Mar 2018 11:49:42 +0100 Subject: [PATCH] meson: autodetect split-usr Also move the status from "features" to the paths section. This is more of an anti-feature. --- meson.build | 8 ++++++-- meson_options.txt | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/meson.build b/meson.build index 37b35c034..a71cd2a0c 100644 --- a/meson.build +++ b/meson.build @@ -70,7 +70,11 @@ m4_defines = [] ##################################################################### -split_usr = get_option('split-usr') +if get_option('split-usr') == 'auto' + split_usr = run_command('test', '-L', '/bin').returncode() != 0 +else + split_usr = get_option('split-usr') == 'true' +endif conf.set10('HAVE_SPLIT_USR', split_usr) rootprefixdir = get_option('rootprefix') @@ -3051,6 +3055,7 @@ run_target( status = [ '@0@ @1@'.format(meson.project_name(), meson.project_version()), + 'split /usr: @0@'.format(split_usr), #if 0 /// UNSUPPORTED by elogind # 'prefix directory: @0@'.format(prefixdir), # 'rootprefix directory: @0@'.format(rootprefixdir), @@ -3216,7 +3221,6 @@ foreach tuple : [ ['html pages', want_html], ['man page indices', want_man and have_lxml], #if 0 /// UNNEEDED by elogind -# ['split /usr', conf.get('HAVE_SPLIT_USR') == 1], # ['SysV compat'], #endif // 0 ['utmp'], diff --git a/meson_options.txt b/meson_options.txt index c08325567..e6696dea9 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -16,8 +16,8 @@ # You should have received a copy of the GNU Lesser General Public License # along with elogind; If not, see . -option('split-usr', type : 'boolean', value : false, - description : '''assume that /bin, /sbin aren't symlinks into /usr''') +option('split-usr', type : 'combo', choices : ['auto', 'true', 'false'], + description : '''/bin, /sbin aren't symlinks into /usr''') option('rootlibdir', type : 'string', description : '''[/usr]/lib/x86_64-linux-gnu or such''') option('rootprefix', type : 'string', -- 2.30.2