From: Amitay Isaacs <amitay@gmail.com>
Date: Fri, 28 Jun 2019 13:07:34 +0000 (+1000)
Subject: lib/util: Build genrand for util core
X-Git-Tag: ldb-2.2.0~644
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a59fd8164c949dff7cbde61d8a914c5a373cb14c;p=thirdparty%2Fsamba.git

lib/util: Build genrand for util core

messages_dgm depends on genrand.

Signed-off-by: Amitay Isaacs <amitay@gmail.com>
Reviewed-by: Volker Lendecke <vl@samba.org>
---

diff --git a/ctdb/wscript b/ctdb/wscript
index dae25e725dc..a03090ab9fc 100644
--- a/ctdb/wscript
+++ b/ctdb/wscript
@@ -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'):
diff --git a/lib/util/wscript_build b/lib/util/wscript_build
index 373363e4fd8..fc760ff81aa 100644
--- a/lib/util/wscript_build
+++ b/lib/util/wscript_build
@@ -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',