diff options
| author | Stefan Metzmacher <metze@samba.org> | 2006-09-25 16:59:00 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:20:19 -0500 |
| commit | 95340f8afb12b8c9bcaaa230b4cad74e77a79a9c (patch) | |
| tree | 9e0bb5564a0376f56ae123e3faeef62364355a45 | |
| parent | 1b8d6b3e7d78c9b4d0fdb1676d5a116c12cfe127 (diff) | |
| download | samba-95340f8afb12b8c9bcaaa230b4cad74e77a79a9c.tar.gz samba-95340f8afb12b8c9bcaaa230b4cad74e77a79a9c.tar.bz2 samba-95340f8afb12b8c9bcaaa230b4cad74e77a79a9c.zip | |
r18903: merge from samba3:
define HAVE_LDB_LDAP and HAVE_LDB_SQLITE3
metze
(This used to be commit 4e2f5ba490d717283ab089d90ebd5c108a8c53b0)
| -rw-r--r-- | source4/lib/ldb/common/ldb_modules.c | 4 | ||||
| -rw-r--r-- | source4/lib/ldb/configure.ac | 4 | ||||
| -rw-r--r-- | source4/lib/ldb/ldap.m4 | 1 | ||||
| -rw-r--r-- | source4/lib/ldb/sqlite3.m4 | 1 |
4 files changed, 6 insertions, 4 deletions
diff --git a/source4/lib/ldb/common/ldb_modules.c b/source4/lib/ldb/common/ldb_modules.c index 06a8a4bcf6..adbbe58e10 100644 --- a/source4/lib/ldb/common/ldb_modules.c +++ b/source4/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 -#ifdef HAVE_LDAP +#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/source4/lib/ldb/configure.ac b/source4/lib/ldb/configure.ac index 70a4100451..e1e9d49cee 100644 --- a/source4/lib/ldb/configure.ac +++ b/source4/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/source4/lib/ldb/ldap.m4 b/source4/lib/ldb/ldap.m4 index 911c1364c8..417083ed61 100644 --- a/source4/lib/ldb/ldap.m4 +++ b/source4/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/source4/lib/ldb/sqlite3.m4 b/source4/lib/ldb/sqlite3.m4 index 49e3807730..d0a74ee53c 100644 --- a/source4/lib/ldb/sqlite3.m4 +++ b/source4/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 |