[SCM] Samba Shared Repository - branch v3-6-test updated

[Günther Deschner]

The branch, v3-6-test has been updated
       via  e08e530 s3-waf: fix lib/addns include path.
       via  a4f9ad8 s3-waf: no need anymore to include "source4" globally.
      from  f670bb4 libcli/ldap: use lib/ldb_compat.h for the s3 build

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test


- Log -----------------------------------------------------------------
commit e08e530974c8f1042f27fba5b47921cc1c6c5e13
Author: Günther Deschner <gd at samba.org>
Date:   Mon Jan 24 15:27:52 2011 +0100

    s3-waf: fix lib/addns include path.
    
    Guenther
    
    Autobuild-User: Günther Deschner <gd at samba.org>
    Autobuild-Date: Mon Jan 24 16:15:58 CET 2011 on sn-devel-104
    (cherry picked from commit ef0a3903f007cee5a564699fc9750d6e8a472d7d)

commit a4f9ad8f2f8790d13421affd9952f891e5632465
Author: Günther Deschner <gd at samba.org>
Date:   Mon Jan 24 15:26:11 2011 +0100

    s3-waf: no need anymore to include "source4" globally.
    
    Guenther
    (cherry picked from commit c675b1c827f792e19cbacd91d2356e0df2ee87e3)

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

Summary of changes:
 source3/wscript |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/wscript b/source3/wscript
index fc1cc1d..e286e8f 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -71,8 +71,8 @@ def configure(conf):
         conf.env['build_swat'] = True
 
     conf.ADD_EXTRA_INCLUDES('''#source3 #source3/include #lib/replace #lib/talloc
-                               #lib/tevent #source3/libaddns #source3/librpc
-                               #source3/lib #lib/tdb/include #lib/popt #source4''')
+                               #lib/tevent #lib/addns #source3/librpc
+                               #source3/lib #lib/tdb/include #lib/popt''')
 
     conf.RECURSE('../lib/replace')
     conf.RECURSE('build')


-- 
Samba Shared Repository