]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
lib/util: Build genrand for util core
authorAmitay Isaacs <amitay@gmail.com>
Fri, 28 Jun 2019 13:07:34 +0000 (23:07 +1000)
committerAmitay Isaacs <amitay@samba.org>
Wed, 6 May 2020 00:06:40 +0000 (00:06 +0000)
messages_dgm depends on genrand.

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Volker Lendecke <vl@samba.org>
ctdb/wscript
lib/util/wscript_build

index dae25e725dce11640c7945ea20a5e5af0f8f51b0..a03090ab9fcdbf34c1a80cac25d122722c8fe9f3 100644 (file)
@@ -145,6 +145,10 @@ def configure(conf):
         conf.SAMBA_CHECK_PYTHON()
         conf.SAMBA_CHECK_PYTHON_HEADERS()
 
+        # We just want gnutls_rnd for rand subsystem
+        conf.CHECK_FUNCS_IN('gnutls_rnd', 'gnutls')
+
+
     if conf.CHECK_FOR_THIRD_PARTY():
         conf.RECURSE('third_party/popt')
         if conf.env.standalone_ctdb or conf.CONFIG_GET('ENABLE_SELFTEST'):
index 373363e4fd89a6e8ea23d4c8f35b216fdc2d7c3e..fc760ff81aa6ccdc54e75c0ebdf93b59d65d1b01 100644 (file)
@@ -97,6 +97,12 @@ bld.SAMBA_LIBRARY('msghdr',
                   local_include=False,
                   private_library=True)
 
+bld.SAMBA_LIBRARY('genrand',
+                  source='genrand.c',
+                  deps='replace gnutls',
+                  local_include=False,
+                  private_library=True)
+
 if bld.env.SAMBA_UTIL_CORE_ONLY:
 
     bld.SAMBA_LIBRARY('tevent-util',
@@ -109,12 +115,6 @@ else:
 
     bld.env.public_headers_skip.append('charset_compat.h')
 
-    bld.SAMBA_LIBRARY('genrand',
-                      source='genrand.c',
-                      deps='replace gnutls',
-                      local_include=False,
-                      private_library=True)
-
     bld.SAMBA_BINARY('genrandperf',
                      source='tests/genrandperf.c',
                      deps='genrand replace',