[SCM] Samba Shared Repository - branch master updated

[Jelmer Vernooij]

The branch, master has been updated
       via  18ea6c5 ldb: Only build LIBLDB_MAIN when building ldb itself.
      from  36c1ed2 s4:sam.py - add a test for the group type changing behaviour

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


- Log -----------------------------------------------------------------
commit 18ea6c5dce8be836cb92b5b884cf6abac4a0f857
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Wed Oct 13 16:59:45 2010 +0200

    ldb: Only build LIBLDB_MAIN when building ldb itself.
    
    Autobuild-User: Jelmer Vernooij <jelmer at samba.org>
    Autobuild-Date: Wed Oct 13 15:41:29 UTC 2010 on sn-devel-104

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

Summary of changes:
 source4/lib/ldb/wscript |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/lib/ldb/wscript b/source4/lib/ldb/wscript
index d10bebc..14fb49a 100644
--- a/source4/lib/ldb/wscript
+++ b/source4/lib/ldb/wscript
@@ -187,20 +187,20 @@ def build(bld):
                          deps='tdb',
                          subsystem='ldb')
 
+        # have a separate subsystem for common/ldb.c, so it can rebuild
+        # for install with a different -DLDB_MODULESDIR=
+        bld.SAMBA_SUBSYSTEM('LIBLDB_MAIN',
+                            'common/ldb.c',
+                            deps='tevent',
+                            includes='include',
+                            cflags='-DLDB_MODULESDIR=\"%s\"' % modules_dir)
+
     if s4_build:
         extra_cmdline_deps = ' LDBSAMBA POPT_SAMBA POPT_CREDENTIALS ' \
                 'LIBCMDLINE_CREDENTIALS gensec'
     else:
         extra_cmdline_deps = ''
 
-    # have a separate subsystem for common/ldb.c, so it can rebuild
-    # for install with a different -DLDB_MODULESDIR=
-    bld.SAMBA_SUBSYSTEM('LIBLDB_MAIN',
-                        'common/ldb.c',
-                        deps='tevent',
-                        includes='include',
-                        cflags='-DLDB_MODULESDIR=\"%s\"' % modules_dir)
-
     bld.SAMBA_SUBSYSTEM('LIBLDB_CMDLINE',
                         'tools/ldbutil.c tools/cmdline.c',
                         'ldb dl popt' + extra_cmdline_deps)


-- 
Samba Shared Repository