sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-13 13:18:06 +03:00
Code

r18901: try to fix the samba3 build without having ldap

Browse Source 
vl: you were a few seconds faster than me...:-)

metze
(This used to be commit 63e5727471)
This commit is contained in:
Stefan Metzmacher 2006-09-25 16:47:50 +00:00 committed by Gerald (Jerry) Carter
parent b70ee55a7c
commit ed724f9047
5 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source3/configure.in
View File

@ -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 if test x"$ac_cv_func_ext_ldap_initialize" != x"yes"; then
AC_MSG_WARN(Disabling ldb_ldap support (requires ldap_initialize)) AC_MSG_WARN(Disabling ldb_ldap support (requires ldap_initialize))
else else
AC_DEFINE(HAVE_LDB_LDAP,1,[Whether ldb_ldap is available])
LDBLDAP="lib/ldb/ldb_ldap/ldb_ldap.o" LDBLDAP="lib/ldb/ldb_ldap/ldb_ldap.o"
fi fi
with_ldap_support=yes with_ldap_support=yes

4
source3/lib/ldb/common/ldb_modules.c
View File

@ -137,13 +137,13 @@ static const struct ldb_module_ops *ldb_find_module_ops(const char *name)
#ifndef STATIC_ldb_MODULES #ifndef STATIC_ldb_MODULES
#if defined(HAVE_LDAP) && defined(HAVE_LDAP_INITIALIZE) #ifdef HAVE_LDB_LDAP
#define LDAP_INIT ldb_ldap_init, #define LDAP_INIT ldb_ldap_init,
#else #else
#define LDAP_INIT #define LDAP_INIT
#endif #endif
#ifdef HAVE_SQLITE3 #ifdef HAVE_LDB_SQLITE3
#define SQLITE3_INIT ldb_sqlite3_init, #define SQLITE3_INIT ldb_sqlite3_init,
#else #else
#define SQLITE3_INIT #define SQLITE3_INIT

4
source3/lib/ldb/configure.ac
View File

@ -54,7 +54,7 @@ m4_include(libtdb.m4)
m4_include(ldap.m4) m4_include(ldap.m4)
if test x"$with_ldap_support" = x"yes"; then if test x"$with_ldap_support" = x"yes"; then
LIBS="$LIBS -llber -lldap" LIBS="$LIBS -llber -lldap"
CFLAGS="$CFLAGS -DHAVE_LDAP=1" CFLAGS="$CFLAGS -DHAVE_LDB_LDAP=1"
EXTRA_OBJ="$EXTRA_OBJ ldb_ldap/ldb_ldap.o" EXTRA_OBJ="$EXTRA_OBJ ldb_ldap/ldb_ldap.o"
TESTS="$TESTS test-ldap.sh" TESTS="$TESTS test-ldap.sh"
fi fi
@ -62,7 +62,7 @@ fi
m4_include(sqlite3.m4) m4_include(sqlite3.m4)
if test x"$with_sqlite3_support" = x"yes"; then if test x"$with_sqlite3_support" = x"yes"; then
LIBS="$LIBS -lsqlite3" LIBS="$LIBS -lsqlite3"
CFLAGS="$CFLAGS -DHAVE_SQLITE3=1" CFLAGS="$CFLAGS -DHAVE_LDB_SQLITE3=1"
EXTRA_OBJ="$EXTRA_OBJ ldb_sqlite3/ldb_sqlite3.o" EXTRA_OBJ="$EXTRA_OBJ ldb_sqlite3/ldb_sqlite3.o"
TESTS="$TESTS test-sqlite3.sh" TESTS="$TESTS test-sqlite3.sh"
fi fi

1
source3/lib/ldb/ldap.m4
View File

@ -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 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_LDAP,1,[Whether ldap is available])
AC_DEFINE(HAVE_LDB_LDAP,1,[Whether ldb_ldap is available])
with_ldap_support=yes with_ldap_support=yes
AC_MSG_CHECKING(whether LDAP support is used) AC_MSG_CHECKING(whether LDAP support is used)
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)

1
source3/lib/ldb/sqlite3.m4
View File

@ -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 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_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_CHECKING(whether SQLITE3 support is used)
AC_MSG_RESULT(yes) AC_MSG_RESULT(yes)
with_sqlite3_support=yes with_sqlite3_support=yes