svn commit: samba r18903 - in branches/SAMBA_4_0/source/lib/ldb: . common

metze at samba.org metze at samba.org
Mon Sep 25 16:59:00 GMT 2006


Author: metze
Date: 2006-09-25 16:59:00 +0000 (Mon, 25 Sep 2006)
New Revision: 18903

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=18903

Log:
merge from samba3:

define HAVE_LDB_LDAP and HAVE_LDB_SQLITE3

metze
Modified:
   branches/SAMBA_4_0/source/lib/ldb/common/ldb_modules.c
   branches/SAMBA_4_0/source/lib/ldb/configure.ac
   branches/SAMBA_4_0/source/lib/ldb/ldap.m4
   branches/SAMBA_4_0/source/lib/ldb/sqlite3.m4


Changeset:
Modified: branches/SAMBA_4_0/source/lib/ldb/common/ldb_modules.c
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/common/ldb_modules.c	2006-09-25 16:55:19 UTC (rev 18902)
+++ branches/SAMBA_4_0/source/lib/ldb/common/ldb_modules.c	2006-09-25 16:59:00 UTC (rev 18903)
@@ -137,13 +137,13 @@
 
 #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

Modified: branches/SAMBA_4_0/source/lib/ldb/configure.ac
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/configure.ac	2006-09-25 16:55:19 UTC (rev 18902)
+++ branches/SAMBA_4_0/source/lib/ldb/configure.ac	2006-09-25 16:59:00 UTC (rev 18903)
@@ -54,7 +54,7 @@
 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 @@
 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

Modified: branches/SAMBA_4_0/source/lib/ldb/ldap.m4
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/ldap.m4	2006-09-25 16:55:19 UTC (rev 18902)
+++ branches/SAMBA_4_0/source/lib/ldb/ldap.m4	2006-09-25 16:59:00 UTC (rev 18903)
@@ -69,6 +69,7 @@
   
   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)

Modified: branches/SAMBA_4_0/source/lib/ldb/sqlite3.m4
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/sqlite3.m4	2006-09-25 16:55:19 UTC (rev 18902)
+++ branches/SAMBA_4_0/source/lib/ldb/sqlite3.m4	2006-09-25 16:59:00 UTC (rev 18903)
@@ -40,6 +40,7 @@
 
   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



More information about the samba-cvs mailing list