[SCM] Samba Shared Repository - branch master updated

[Günther Deschner]

The branch, master has been updated
       via  8ba3eac s3-waf: remove duplicate CONFIGFILE from dynconfig.py which caused sysconfigdir to be ignored.
       via  b828dc0 s3-waf: fix the build of nsstest with --enable-nss-wrapper.
      from  0261b96 s4-waf: move the RPC_NDR subsystems to main librpc wscript_build.

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


- Log -----------------------------------------------------------------
commit 8ba3eacf6b8ef4e6e681d4626b1efd99b04eca33
Author: Günther Deschner <gd at samba.org>
Date:   Thu Sep 23 15:33:43 2010 -0700

    s3-waf: remove duplicate CONFIGFILE from dynconfig.py which caused sysconfigdir
    to be ignored.
    
    Guenther

commit b828dc055e9e3c6f1f174e191fb3bbc09528ec6a
Author: Günther Deschner <gd at samba.org>
Date:   Thu Sep 23 15:13:23 2010 -0700

    s3-waf: fix the build of nsstest with --enable-nss-wrapper.
    
    Guenther

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

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


Changeset truncated at 500 lines:

diff --git a/source3/build/dynconfig.py b/source3/build/dynconfig.py
index d04fe3d..ad9d245 100644
--- a/source3/build/dynconfig.py
+++ b/source3/build/dynconfig.py
@@ -26,7 +26,6 @@ dyn_cflags = {
     'DATADIR'                        : '${DATADIR}',
     'LOGFILEBASE'                    : '${LOCALSTATEDIR}',
     'CONFIGDIR'                      : '${SYSCONFDIR}',
-    'CONFIGFILE'                     : '${LIBDIR}/smb.conf',
     'NCALRPCDIR'                     : '${LOCALSTATEDIR}/ncalrpc',
     'SWATDIR'                        : '${PREFIX}/swat',
     'PRIVATE_DIR'                    : '${PRIVATEDIR}',
diff --git a/source3/wscript_build b/source3/wscript_build
index f833b59..73a6c22 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -1530,6 +1530,7 @@ bld.SAMBA_BINARY('locktest',
 
 bld.SAMBA_BINARY('nsstest',
                  source=NSSTEST_SRC,
+                 deps='NSS_WRAPPER',
                  vars=locals())
 
 bld.SAMBA_BINARY('pdbtest',


-- 
Samba Shared Repository