[SCM] Samba Shared Repository - branch v4-6-test updated

[Karolin Seeger]

The branch, v4-6-test has been updated
       via  82317ad systemd: fix detection of libsystemd
      from  17d5052 s3: smbd: inotify_map_mask_to_filter incorrectly indexes an array.

https://git.samba.org/?p=samba.git;a=shortlog;h=v4-6-test


- Log -----------------------------------------------------------------
commit 82317ada6e79af928d8e880f1f38498e3caae508
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
    
    (cherry picked from commit 09bc5b5374227a555f580c3d7c1d82f15bb818bc)
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=12764
    systemd: fix detection of libsystemd
    
    Autobuild-User(v4-6-test): Karolin Seeger <kseeger at samba.org>
    Autobuild-Date(v4-6-test): Wed May  3 20:43:57 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