diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2010-05-31 16:05:41 +0200 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2010-05-31 19:22:03 +0200 |
commit | 82d56b937445585b9e60451daf660aee5ace0523 (patch) | |
tree | 83f9af2493eac6f70fa59974adc303c856efb9da /source4/lib/ldb/tools | |
parent | 471ed70c497f4eeaca27594d609f41f2b2c689cd (diff) | |
download | samba-82d56b937445585b9e60451daf660aee5ace0523.tar.gz samba-82d56b937445585b9e60451daf660aee5ace0523.tar.bz2 samba-82d56b937445585b9e60451daf660aee5ace0523.zip |
ldb: Fix dependencies when building with system ldb.
Diffstat (limited to 'source4/lib/ldb/tools')
-rw-r--r-- | source4/lib/ldb/tools/cmdline.c | 10 | ||||
-rw-r--r-- | source4/lib/ldb/tools/ldbedit.c | 7 | ||||
-rw-r--r-- | source4/lib/ldb/tools/ldbsearch.c | 6 | ||||
-rw-r--r-- | source4/lib/ldb/tools/ldbtest.c | 5 |
4 files changed, 24 insertions, 4 deletions
diff --git a/source4/lib/ldb/tools/cmdline.c b/source4/lib/ldb/tools/cmdline.c index 180923fc63..c2b595f329 100644 --- a/source4/lib/ldb/tools/cmdline.c +++ b/source4/lib/ldb/tools/cmdline.c @@ -21,12 +21,9 @@ License along with this library; if not, see <http://www.gnu.org/licenses/>. */ -#include "ldb_includes.h" -#include "ldb.h" -#include "tools/cmdline.h" - #if (_SAMBA_BUILD_ >= 4) #include "includes.h" +#include <ldb.h> #include "lib/cmdline/popt_common.h" #include "lib/ldb-samba/ldif_handlers.h" #include "auth/gensec/gensec.h" @@ -36,8 +33,13 @@ #include "librpc/gen_ndr/drsblobs.h" #include "dsdb/schema/schema.h" #include "dsdb/common/proto.h" +#else +#include "ldb_includes.h" +#include "ldb.h" #endif +#include "tools/cmdline.h" + static struct ldb_cmdline options; /* needs to be static for older compilers */ static struct poptOption popt_options[] = { diff --git a/source4/lib/ldb/tools/ldbedit.c b/source4/lib/ldb/tools/ldbedit.c index 66354666a6..f28964b06a 100644 --- a/source4/lib/ldb/tools/ldbedit.c +++ b/source4/lib/ldb/tools/ldbedit.c @@ -30,7 +30,14 @@ * * Author: Andrew Tridgell */ + +#ifdef _SAMBA_BUILD_ +#include "includes.h" +#include <system/filesys.h> +#else #include "ldb_includes.h" +#endif + #include "ldb.h" #include "tools/cmdline.h" #include "tools/ldbutil.h" diff --git a/source4/lib/ldb/tools/ldbsearch.c b/source4/lib/ldb/tools/ldbsearch.c index 179646c73f..55144a7a8c 100644 --- a/source4/lib/ldb/tools/ldbsearch.c +++ b/source4/lib/ldb/tools/ldbsearch.c @@ -31,8 +31,14 @@ * Author: Andrew Tridgell */ +#ifdef _SAMBA_BUILD_ +#include "includes.h" +#include <ldb.h> +#else #include "ldb_includes.h" #include "ldb.h" +#endif + #include "tools/cmdline.h" static void usage(void) diff --git a/source4/lib/ldb/tools/ldbtest.c b/source4/lib/ldb/tools/ldbtest.c index 077eb987ac..b76889c61f 100644 --- a/source4/lib/ldb/tools/ldbtest.c +++ b/source4/lib/ldb/tools/ldbtest.c @@ -31,7 +31,12 @@ * Author: Andrew Tridgell */ +#ifdef _SAMBA_BUILD_ +#include "includes.h" +#else #include "ldb_includes.h" +#endif + #include "ldb.h" #include "tools/cmdline.h" |