wafsamba: Clarify needs_python argument name, use pyembed/pyext where

[sfrench/samba-autobuild/.git] / source4 / smbd / wscript_build

diff --git a/source4/smbd/wscript_build b/source4/smbd/wscript_build
index 815b586d79e7c8c202a55c21e51191450e299469..a57fe291d69d5f518610285f0d84483266314d36 100644 (file)
--- a/source4/smbd/wscript_build
+++ b/source4/smbd/wscript_build
@@ -3,7 +3,7 @@
 bld.SAMBA_SUBSYSTEM('service',
        source='service.c service_stream.c service_named_pipe.c service_task.c',
        autoproto='service_proto.h',
-       deps='tevent MESSAGING samba_socket NDR_NAMED_PIPE_AUTH NAMED_PIPE_AUTH_TSTREAM HEIMDAL_GSSAPI CREDENTIALS LIBTSOCKET LIBSAMBA_TSOCKET'
+       deps='tevent MESSAGING samba_socket RPC_NDR_IRPC NDR_NAMED_PIPE_AUTH NAMED_PIPE_AUTH_TSTREAM gssapi CREDENTIALS LIBTSOCKET LIBSAMBA_TSOCKET'
        )
 
 
@@ -17,12 +17,11 @@ bld.SAMBA_SUBSYSTEM('PIDFILE',
 bld.SAMBA_BINARY('samba',
        source='server.c',
        manpages='samba.8',
-       installdir='SBINDIR',
-        subsystem_name='service',
+       subsystem_name='service',
        deps='''LIBEVENTS process_model service LIBSAMBA-HOSTCONFIG LIBSAMBA-UTIL POPT_SAMBA PIDFILE
                 popt gensec registry ntptr ntvfs share CLUSTER DCESRV''',
-        needs_python=True,
-        install_path='${SBINDIR}'
+       pyembed=True,
+       install_path='${SBINDIR}'
        )
 
 
@@ -40,7 +39,7 @@ bld.SAMBA_MODULE('process_model_standard',
        source='process_standard.c',
        subsystem='process_model',
        init_function='process_model_standard_init',
-       deps='LIBEVENTS SETPROCTITLE'
+       deps='LIBEVENTS SETPROCTITLE LDBSAMBA'
        )
 
 
@@ -48,7 +47,7 @@ bld.SAMBA_MODULE('process_model_thread',
        source='process_thread.c',
        subsystem='process_model',
        init_function='process_model_thread_init',
-        enabled=False,
+       enabled=False,
        deps='pthread'
        )
 
@@ -60,6 +59,13 @@ bld.SAMBA_MODULE('process_model_prefork',
        deps='LIBEVENTS SETPROCTITLE'
        )
 
+bld.SAMBA_MODULE('process_model_onefork',
+       source='process_onefork.c',
+       subsystem='process_model',
+       init_function='process_model_onefork_init',
+       deps='LIBEVENTS SETPROCTITLE'
+       )
+
 
 bld.SAMBA_SUBSYSTEM('process_model',
        source='process_model.c',