s3-build: Only define ldb3 when not in standalone build.
authorJelmer Vernooij <jelmer@samba.org>
Tue, 26 Jul 2011 13:21:02 +0000 (15:21 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 26 Jul 2011 16:21:48 +0000 (18:21 +0200)
This prevents errors about it by 'make SYMBOLCHECK=1' if there is a
system ldb present.

Autobuild-User: Jelmer Vernooij <jelmer@samba.org>
Autobuild-Date: Tue Jul 26 18:21:48 CEST 2011 on sn-devel-104

source3/wscript_build

index 40a1d9be3ae3c341d4dd23abd277bbbbf6f782ae..50b21e9efa438a7dba000be06fb38a2df6de6db6 100755 (executable)
@@ -1052,10 +1052,6 @@ bld.SAMBA3_LIBRARY('CHARSET3',
                     deps='samba-util util_str',
                    private_library=True)
 
-bld.SAMBA3_SUBSYSTEM('ldb3',
-                    source='lib/ldb_compat.c',
-                    deps='samba-util')
-
 bld.SAMBA3_SUBSYSTEM('errors3',
                      source='libsmb/errormap.c libsmb/smberr.c lib/errmap_unix.c',
                      deps='errors')
@@ -1411,6 +1407,9 @@ bld.INSTALL_FILES('${SWATDIR}', swat_files, base_name='../swat')
 
 if not bld.env.toplevel_build:
     bld.SAMBA3_SUBSYSTEM('POPT_SAMBA', source='', deps='popt_samba3')
+    bld.SAMBA3_SUBSYSTEM('ldb3',
+                        source='lib/ldb_compat.c',
+                        deps='samba-util')
     bld.SAMBA3_SUBSYSTEM('ldb', source='', deps='ldb3')
     bld.SAMBA3_SUBSYSTEM('dcerpc', '', deps='UTIL_TEVENT')
     bld.SAMBA3_SUBSYSTEM('cli-ldap', '', deps='UTIL_TEVENT')