Remove public library dcerpc-atsvc.

[obnox/samba/samba-obnox.git] / source4 / torture / wscript_build

diff --git a/source4/torture/wscript_build b/source4/torture/wscript_build
index 5f5203301c5fc6f87fee3cd9e674039e4fad5120..6cf255ba1bf0f26ee93f6d0613fac7ac3deadcd2 100755 (executable)
--- a/source4/torture/wscript_build
+++ b/source4/torture/wscript_build
@@ -32,19 +32,44 @@ bld.RECURSE('winbind')
 bld.RECURSE('libnetapi')
 bld.RECURSE('libsmbclient')
 
-heimdal_specific = dict()
-heimdal_specific['ndr'] = ('','')
-heimdal_specific['rpc'] = ('','')
-if bld.CONFIG_SET('AD_DC_BUILD_IS_ENABLED'):
-       heimdal_specific['rpc'] = (' rpc/backupkey.c rpc/spoolss_notify.c',
-                                   ' RPC_NDR_BACKUPKEY SMB_SERVER dcerpc_server ntvfs')
+ntvfs_specific = dict(source='', deps='')
+
+# Yes, the spoolss_notify test uses the NTVFS file server to run the SMB server expected
+# to handle the RPC callback!
+if bld.CONFIG_SET('WITH_NTVFS_FILESERVER'):
+       ntvfs_specific['source'] += ' rpc/spoolss_notify.c'
+       ntvfs_specific['deps'] += ' SMB_SERVER dcerpc_server ntvfs'
 
 bld.SAMBA_SUBSYSTEM('TORTURE_NDR',
-       source='ndr/ndr.c ndr/winreg.c ndr/atsvc.c ndr/lsa.c ndr/epmap.c ndr/dfs.c ndr/netlogon.c ndr/drsuapi.c ndr/spoolss.c ndr/ntprinting.c ndr/samr.c ndr/dfsblob.c ndr/drsblobs.c ndr/nbt.c ndr/ntlmssp.c ndr/string.c ndr/backupkey.c ndr/witness.c',
+        source='''ndr/ndr.c
+                  ndr/winreg.c
+                  ndr/atsvc.c
+                  ndr/lsa.c
+                  ndr/epmap.c
+                  ndr/dfs.c
+                  ndr/netlogon.c
+                  ndr/drsuapi.c
+                  ndr/spoolss.c
+                  ndr/ntprinting.c
+                  ndr/samr.c
+                  ndr/dfsblob.c
+                  ndr/drsblobs.c
+                  ndr/nbt.c
+                  ndr/ntlmssp.c
+                  ndr/string.c
+                  ndr/backupkey.c
+                  ndr/witness.c
+                  ndr/clusapi.c
+                  ndr/negoex.c
+                 ''',
        autoproto='ndr/proto.h',
        deps='torture'
        )
 
+if bld.CONFIG_SET('HAVE_GNUTLS_3_4_7'):
+    torture_rpc_backupkey = 'rpc/backupkey.c'
+else:
+    torture_rpc_backupkey = 'rpc/backupkey_heimdal.c'
 
 bld.SAMBA_MODULE('torture_rpc',
                  source='''
@@ -61,7 +86,6 @@ bld.SAMBA_MODULE('torture_rpc',
                         rpc/spoolss.c
                         rpc/spoolss_win.c
                         rpc/spoolss_access.c
-                        rpc/spoolss_notify.c
                         rpc/unixinfo.c
                         rpc/samr.c
                         rpc/samr_accessmask.c
@@ -100,7 +124,8 @@ bld.SAMBA_MODULE('torture_rpc',
                         rpc/bind.c
                         rpc/fsrvp.c
                         rpc/clusapi.c
-                        rpc/witness.c''' + heimdal_specific['rpc'][0],
+                        rpc/witness.c
+                        ''' + torture_rpc_backupkey + ntvfs_specific['source'],
                  autoproto='rpc/proto.h',
                  subsystem='smbtorture',
                  init_function='torture_rpc_init',
@@ -115,7 +140,7 @@ bld.SAMBA_MODULE('torture_rpc',
                       RPC_NDR_ECHO
                       RPC_NDR_SVCCTL
                       RPC_NDR_NETLOGON
-                      dcerpc-atsvc
+                      RPC_NDR_ATSVC
                       RPC_NDR_DRSUAPI
                       RPC_NDR_LSA
                       RPC_NDR_EPMAPPER
@@ -145,7 +170,8 @@ bld.SAMBA_MODULE('torture_rpc',
                       RPC_NDR_FSRVP
                       RPC_NDR_CLUSAPI
                       RPC_NDR_WITNESS
-                      ''' + heimdal_specific['rpc'][1],
+                      RPC_NDR_BACKUPKEY
+                      ''' + ntvfs_specific['deps'],
                  internal_module=True)
 
 bld.RECURSE('drs')
@@ -260,7 +286,7 @@ bld.SAMBA_SUBSYSTEM('torturemain',
 bld.SAMBA_BINARY('smbtorture',
                  source=[],
                  manpages='man/smbtorture.1',
-                 public_headers='smbtorture.h',
+                 private_headers='smbtorture.h',
                  deps='torturemain torture popt POPT_SAMBA POPT_CREDENTIALS dcerpc LIBCLI_SMB SMBREADLINE ' + TORTURE_MODULES,
                  pyembed=True
                  )