[SCM] Samba Shared Repository - branch master updated

[Matthieu Patou]

The branch, master has been updated
       via  c55f5f2... s4 nss_switch: fix build problem on computer without the iniparser
      from  dbbfad8... s4-waf: add the missing bits for builing nss_winbind and pam_winbind

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


- Log -----------------------------------------------------------------
commit c55f5f2a35a138e130e15eee8206b5f72675b7e8
Author: Matthieu Patou <mat at matws.net>
Date:   Sat Jul 17 20:07:52 2010 +0400

    s4 nss_switch: fix build problem on computer without the iniparser
    
    Although the build was ok on my workstation it appears that on build
    server it was not because the include path was not correct.

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

Summary of changes:
 lib/iniparser/{ => src}/wscript_build |    2 +-
 source4/wscript_build                 |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename lib/iniparser/{ => src}/wscript_build (53%)


Changeset truncated at 500 lines:

diff --git a/lib/iniparser/wscript_build b/lib/iniparser/src/wscript_build
similarity index 53%
rename from lib/iniparser/wscript_build
rename to lib/iniparser/src/wscript_build
index 419c232..aa15c9f 100644
--- a/lib/iniparser/wscript_build
+++ b/lib/iniparser/src/wscript_build
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 
 bld.SAMBA_SUBSYSTEM('LIBINIPARSER',
-                    source='../iniparser_build/iniparser.c ../iniparser_build/dictionary.c ../iniparser_build/strlib.c',
+                    source='../../iniparser_build/iniparser.c ../../iniparser_build/dictionary.c ../../iniparser_build/strlib.c',
                     deps='replace',
                     cflags=''
                     )
diff --git a/source4/wscript_build b/source4/wscript_build
index c8c14bc..090c914 100644
--- a/source4/wscript_build
+++ b/source4/wscript_build
@@ -56,7 +56,7 @@ bld.RECURSE('cluster')
 bld.RECURSE('smbd')
 bld.RECURSE('libnet')
 bld.RECURSE('auth')
-bld.RECURSE('../lib/iniparser')
+bld.RECURSE('../lib/iniparser/src')
 bld.RECURSE('../nsswitch')
 bld.RECURSE('../nsswitch/libwbclient')
 bld.RECURSE('lib/samba3')


-- 
Samba Shared Repository