Fix logical error in meson.build (#7658)

sysvinit_path and sysvrcnd_path have to be set both to activate Sysv compatibility.
This commit is contained in:
Max Harmathy 2017-12-15 16:05:25 +01:00 committed by Zbigniew Jędrzejewski-Szmek
parent bd2538b50b
commit 5424824adf

View file

@ -67,7 +67,7 @@ endif
sysvinit_path = get_option('sysvinit-path') sysvinit_path = get_option('sysvinit-path')
sysvrcnd_path = get_option('sysvrcnd-path') sysvrcnd_path = get_option('sysvrcnd-path')
have = sysvinit_path != '' or sysvrcnd_path != '' have = sysvinit_path != '' and sysvrcnd_path != ''
conf.set10('HAVE_SYSV_COMPAT', have, conf.set10('HAVE_SYSV_COMPAT', have,
description : 'SysV init scripts and rcN.d links are supported') description : 'SysV init scripts and rcN.d links are supported')
m4_defines += have ? ['-DHAVE_SYSV_COMPAT'] : [] m4_defines += have ? ['-DHAVE_SYSV_COMPAT'] : []