sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

systemd: fix detection of libsystemd

Browse Source 
On Fedora 25 detection of libsystemd actually fails due to wrong
assumptions in the configure test. conf.CHECK_LIB returns a list
so 'not conf.CHECK_LIB(...)' is always False and we never get to check
libsystemd.

Instead, remember result of checking pkg-config for separate
libsystemd-daemon and libsystemd-journal libraries. If they miss,
attempt to use libsystemd library instead.

Signed-off-by: Alexander Bokovoy <ab@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>

Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
Autobuild-Date(master): Tue May  2 13:05:43 CEST 2017 on sn-devel-144
This commit is contained in:
Alexander Bokovoy 2016-09-29 00:09:12 +03:00 committed by Andreas Schneider
parent 2951c592f7
commit 09bc5b5374
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/util/wscript_configure
View File

@ -110,16 +110,17 @@ conf.SET_TARGET_TYPE('systemd-journal', 'EMPTY')
conf.SET_TARGET_TYPE('systemd', 'EMPTY')
if Options.options.enable_systemd != False:
conf.CHECK_CFG(package='libsystemd-daemon', args='--cflags --libs',
r_daemon = conf.CHECK_CFG(package='libsystemd-daemon', args='--cflags --libs',
msg='Checking for libsystemd-daemon')
if not conf.CHECK_LIB('systemd-daemon', shlib=True):
conf.CHECK_LIB('systemd', shlib=True)
if Options.options.enable_systemd != False:
conf.CHECK_CFG(package='libsystemd-journal', args='--cflags --libs',
r_journal = conf.CHECK_CFG(package='libsystemd-journal', args='--cflags --libs',
msg='Checking for libsystemd-journal')
if not conf.CHECK_LIB('systemd-journal', shlib=True):
if r_daemon is None and r_journal is None:
conf.CHECK_CFG(package='libsystemd', args='--cflags --libs',
msg='Checking for libsystemd')
conf.CHECK_LIB('systemd', shlib=True)
else:
conf.CHECK_LIB('systemd-daemon', shlib=True)
conf.CHECK_LIB('systemd-journal', shlib=True)
if Options.options.enable_lttng != False:
conf.CHECK_CFG(package='lttng-ust', args='--cflags --libs',