[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  00be7ea s3-waf: fix the build.
       via  260ad23 s3-waf: add more diroptions.
      from  0b0a717 s3 waf: more correctly generate symbols for pdb/vfs/auth/etc. modules

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 00be7ea4130955021704066401f6d47bd1c717e7
Author: Günther Deschner <gd at samba.org>
Date:   Thu Sep 23 16:40:43 2010 -0700

    s3-waf: fix the build.
    
    Guenther

commit 260ad237273d3a1c34811a970680488ad3a83013
Author: Günther Deschner <gd at samba.org>
Date:   Thu Sep 23 16:39:41 2010 -0700

    s3-waf: add more diroptions.
    
    Guenther

-----------------------------------------------------------------------

Summary of changes:
 source3/build/dynconfig.py |   12 +++++++++++-
 source3/wscript_build      |    7 +++++++
 2 files changed, 18 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/build/dynconfig.py b/source3/build/dynconfig.py
index ad9d245..4bc97e5 100644
--- a/source3/build/dynconfig.py
+++ b/source3/build/dynconfig.py
@@ -2,7 +2,7 @@ import string, Utils
 
 # list of directory options to offer in configure
 dir_options = {
-    'with-piddir'                         : [ '${PREFIX}/var/run', 'where to put pid files' ],
+    'with-piddir'                         : [ '${PREFIX}/var/locks', 'where to put pid files' ],
     'with-privatedir'                     : [ '${PREFIX}/private', 'Where to put sam.ldb and other private files' ],
     'with-winbindd-socket-dir'            : [ '${PREFIX}/var/lib/winbindd', 'winbind socket directory' ],
     'with-winbindd-privileged-socket-dir' : [ '${PREFIX}/var/lib/winbindd_privileged', 'winbind privileged socket directory'],
@@ -11,6 +11,16 @@ dir_options = {
     'with-codepagedir'                    : [ '${PREFIX}/lib/samba', 'where to put codepages' ],
     'with-privatedir'                     : [ '${PREFIX}/private', 'where to put smbpasswd' ],
     'with-cachedir'                       : [ '${PREFIX}/var/locks', 'where to put temporary cache files' ],
+    'with-logfilebase'                    : [ '${PREFIX}/var/log/samba', 'Where to put log files' ],
+    'with-configdir'                      : [ '${PREFIX}/etc/samba', 'Where to put configuration files' ],
+    'with-swatdir'                        : [ '${PREFIX}/swat', 'Where to put SWAT files' ],
+    'with-statedir'                       : [ '${PREFIX}/var/locks', 'where to put persistent state files' ],
+    'with-cachedir'                       : [ '${PREFIX}/var/locks', 'where to put temporary cache files' ],
+    'with-ncalrpcdir'                     : [ '${PREFIX}/var/ncalrpc', 'where to put ncalrpc sockets' ],
+    'with-pammodulesdir'                  : [ '', 'Which directory to use for PAM modules' ],
+    'with-codepagedir'                    : [ '${PREFIX}/lib/samba', 'Where to put codepages' ],
+    'with-selftest-prefix'                : [ '', 'The prefix where make test will be run' ],
+    'with-selftest-shrdir'                : [ '', 'The share directory that make test will be run against' ]
     }
 
 # list of cflags to use for dynconfig.c
diff --git a/source3/wscript_build b/source3/wscript_build
index 75c7e0b..98b609b 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -1345,6 +1345,9 @@ bld.SAMBA_SUBSYSTEM('NDR_STANDARD',
                     source=LIBNDR_SRC,
                     vars=locals())
 
+#FIXME
+bld.SAMBA_SUBSYSTEM('dcerpc', '')
+
 bld.SAMBA_SUBSYSTEM('LZXPRESS',
 		    deps='replace',
 		    source='../lib/compression/lzxpress.c')
@@ -1358,6 +1361,10 @@ bld.SAMBA_SUBSYSTEM('NDR_DCERPC',
                     source='../librpc/gen_ndr/ndr_dcerpc.c',
                     vars=locals())
 
+bld.SAMBA_SUBSYSTEM('NDR_SRVSVC',
+                    source='../librpc/gen_ndr/ndr_srvsvc.c',
+                    vars=locals())
+
 bld.SAMBA_SUBSYSTEM('LIBSAMBA-ERRORS',
 		    source='../libcli/util/doserr.c libsmb/nterr.c')
 


-- 
Samba Shared Repository