summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2006-09-25 16:47:50 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:14:44 -0500
commited724f90479af3ee0d9583cef17f3d2365c327dd (patch)
tree2dfb0f7f71d8a77b7bbc91c4e710b453556cfc85 /source3
parentb70ee55a7cec1a9774f6ab56e92d0d9dd36ca217 (diff)
downloadsamba-ed724f90479af3ee0d9583cef17f3d2365c327dd.tar.gz
samba-ed724f90479af3ee0d9583cef17f3d2365c327dd.tar.bz2
samba-ed724f90479af3ee0d9583cef17f3d2365c327dd.zip
r18901: try to fix the samba3 build without having ldap
vl: you were a few seconds faster than me...:-) metze (This used to be commit 63e5727471bdf686f292a36aa43267213fb6e2f3)
Diffstat (limited to 'source3')
-rw-r--r--source3/configure.in1
-rw-r--r--source3/lib/ldb/common/ldb_modules.c4
-rw-r--r--source3/lib/ldb/configure.ac4
-rw-r--r--source3/lib/ldb/ldap.m41
-rw-r--r--source3/lib/ldb/sqlite3.m41
5 files changed, 7 insertions, 4 deletions
diff --git a/source3/configure.in b/source3/configure.in
index a1c9946647..c65f636a3b 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -3141,6 +3141,7 @@ if test x"$with_ldap_support" != x"no"; then
if test x"$ac_cv_func_ext_ldap_initialize" != x"yes"; then
AC_MSG_WARN(Disabling ldb_ldap support (requires ldap_initialize))
else
+ AC_DEFINE(HAVE_LDB_LDAP,1,[Whether ldb_ldap is available])
LDBLDAP="lib/ldb/ldb_ldap/ldb_ldap.o"
fi
with_ldap_support=yes
diff --git a/source3/lib/ldb/common/ldb_modules.c b/source3/lib/ldb/common/ldb_modules.c
index c6cf1e88eb..adbbe58e10 100644
--- a/source3/lib/ldb/common/ldb_modules.c
+++ b/source3/lib/ldb/common/ldb_modules.c
@@ -137,13 +137,13 @@ static const struct ldb_module_ops *ldb_find_module_ops(const char *name)
#ifndef STATIC_ldb_MODULES
-#if defined(HAVE_LDAP) && defined(HAVE_LDAP_INITIALIZE)
+#ifdef HAVE_LDB_LDAP
#define LDAP_INIT ldb_ldap_init,
#else
#define LDAP_INIT
#endif
-#ifdef HAVE_SQLITE3
+#ifdef HAVE_LDB_SQLITE3
#define SQLITE3_INIT ldb_sqlite3_init,
#else
#define SQLITE3_INIT
diff --git a/source3/lib/ldb/configure.ac b/source3/lib/ldb/configure.ac
index 70a4100451..e1e9d49cee 100644
--- a/source3/lib/ldb/configure.ac
+++ b/source3/lib/ldb/configure.ac
@@ -54,7 +54,7 @@ m4_include(libtdb.m4)
m4_include(ldap.m4)
if test x"$with_ldap_support" = x"yes"; then
LIBS="$LIBS -llber -lldap"
- CFLAGS="$CFLAGS -DHAVE_LDAP=1"
+ CFLAGS="$CFLAGS -DHAVE_LDB_LDAP=1"
EXTRA_OBJ="$EXTRA_OBJ ldb_ldap/ldb_ldap.o"
TESTS="$TESTS test-ldap.sh"
fi
@@ -62,7 +62,7 @@ fi
m4_include(sqlite3.m4)
if test x"$with_sqlite3_support" = x"yes"; then
LIBS="$LIBS -lsqlite3"
- CFLAGS="$CFLAGS -DHAVE_SQLITE3=1"
+ CFLAGS="$CFLAGS -DHAVE_LDB_SQLITE3=1"
EXTRA_OBJ="$EXTRA_OBJ ldb_sqlite3/ldb_sqlite3.o"
TESTS="$TESTS test-sqlite3.sh"
fi
diff --git a/source3/lib/ldb/ldap.m4 b/source3/lib/ldb/ldap.m4
index 911c1364c8..417083ed61 100644
--- a/source3/lib/ldb/ldap.m4
+++ b/source3/lib/ldb/ldap.m4
@@ -69,6 +69,7 @@ if test x"$with_ldap_support" != x"no"; then
if test x"$ac_cv_lib_ext_ldap_ldap_init" = x"yes" -a x"$ac_cv_func_ext_ldap_domain2hostlist" = x"yes"; then
AC_DEFINE(HAVE_LDAP,1,[Whether ldap is available])
+ AC_DEFINE(HAVE_LDB_LDAP,1,[Whether ldb_ldap is available])
with_ldap_support=yes
AC_MSG_CHECKING(whether LDAP support is used)
AC_MSG_RESULT(yes)
diff --git a/source3/lib/ldb/sqlite3.m4 b/source3/lib/ldb/sqlite3.m4
index 49e3807730..d0a74ee53c 100644
--- a/source3/lib/ldb/sqlite3.m4
+++ b/source3/lib/ldb/sqlite3.m4
@@ -40,6 +40,7 @@ if test x"$with_sqlite3_support" != x"no"; then
if test x"$ac_cv_lib_ext_sqlite3_sqlite3_open" = x"yes"; then
AC_DEFINE(HAVE_SQLITE3,1,[Whether sqlite3 is available])
+ AC_DEFINE(HAVE_LDB_SQLITE3,1,[Whether ldb_sqlite3 is available])
AC_MSG_CHECKING(whether SQLITE3 support is used)
AC_MSG_RESULT(yes)
with_sqlite3_support=yes