[SCM] Samba Shared Repository - branch master updated
Andreas Schneider
asn at samba.org
Tue May 2 11:06:03 UTC 2017
The branch, master has been updated
via 09bc5b5 systemd: fix detection of libsystemd
from 2951c59 torture3: Make sure dbwrap_parse_record returns NOT_FOUND for invalid watchers data
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 09bc5b5374227a555f580c3d7c1d82f15bb818bc
Author: Alexander Bokovoy <ab at samba.org>
Date: Thu Sep 29 00:09:12 2016 +0300
systemd: fix detection of libsystemd
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 at samba.org>
Reviewed-by: Andreas Schneider <asn at samba.org>
Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
Autobuild-Date(master): Tue May 2 13:05:43 CEST 2017 on sn-devel-144
-----------------------------------------------------------------------
Summary of changes:
lib/util/wscript_configure | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/util/wscript_configure b/lib/util/wscript_configure
index a1e5801..7c17633 100644
--- a/lib/util/wscript_configure
+++ b/lib/util/wscript_configure
@@ -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',
--
Samba Shared Repository
More information about the samba-cvs
mailing list