build: waf build for lib/tls

diff --git a/buildtools/mktowscript/mklist.txt b/buildtools/mktowscript/mklist.txt
index 203c9a3ab36aeed5aefe97eeca904658d8d5cf7e..ee77bb99df5c52a381c54a2b52799a6cfc3c6def 100644 (file)
--- a/buildtools/mktowscript/mklist.txt
+++ b/buildtools/mktowscript/mklist.txt
@@ -60,7 +60,6 @@ source4/lib/com/config.mk
 source4/lib/registry/config.mk
 source4/lib/wmi/config.mk
 source4/lib/socket/config.mk
-source4/lib/tls/config.mk
 source4/lib/samba3/config.mk
 source4/ldap_server/config.mk
 libgpo/config.mk

diff --git a/source4/lib/tls/wscript b/source4/lib/tls/wscript
new file mode 100644 (file)
index 0000000..5a63757
--- /dev/null
+++ b/source4/lib/tls/wscript
@@ -0,0 +1,27 @@
+import Options
+
+def set_options(opt):
+    # allow users to disable gnutls
+    opt.add_option('--disable-gnutls',
+                   help=("Disable use of gnutls"),
+                   action="store_true", dest='disable_gnutls', default=False)
+
+def configure(conf):
+    # check for gnutls
+    conf.check_cfg(package='gnutls',
+                   args='"gnutls >= 1.4.0" --cflags --libs',
+                   msg='Checking for gnutls >= 1.4.0', mandatory=False)
+
+    if 'HAVE_GNUTLS' in conf.env and not Options.options.disable_gnutls:
+        conf.DEFINE('ENABLE_GNUTLS', 1)
+
+    conf.CHECK_HEADERS('gnutls/gnutls.h')
+
+    # check for gnutls_datum types
+    conf.CHECK_TYPES('gnutls_datum gnutls_datum_t')
+
+def build(bld):
+    bld.SAMBA_SUBSYSTEM('LIBTLS',
+                        source='tls.c tlscert.c',
+                        public_deps='talloc GNUTLS GCRYPT LIBSAMBA-HOSTCONFIG samba_socket'
+                        )

diff --git a/source4/wscript b/source4/wscript
index 67c6f96870169c611ed18c9a8aae2870bec9e903..04ae4be3f63f78e4fc79cf84e51a90ff027ef810 100644 (file)
--- a/source4/wscript
+++ b/source4/wscript
@@ -14,6 +14,7 @@ def set_options(opt):
     opt.recurse(LIBREPLACE_DIR)
     opt.recurse(LIBLDB_DIR)
     opt.recurse('selftest')
+    opt.recurse('lib/tls')
 
 
 def configure(conf):
@@ -23,6 +24,7 @@ def configure(conf):
     conf.sub_config(LIBREPLACE_DIR)
     conf.sub_config(LIBLDB_DIR)
     conf.sub_config('heimdal_build')
+    conf.sub_config('lib/tls')
 
     conf.DEFINE('CONFIG_H_IS_FROM_SAMBA', 1)
     conf.ADD_EXTRA_INCLUDES('#source4 #lib #source4/lib  #source4/include #lib/socket_wrapper #lib/talloc #lib/replace #lib/event')