svn commit: samba r18901 - in branches/SAMBA_3_0/source: . lib/ldb lib/ldb/common

[metze at samba.org]

Author: metze
Date: 2006-09-25 16:47:50 +0000 (Mon, 25 Sep 2006)
New Revision: 18901

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

Log:
try to fix the samba3 build without having ldap

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

metze

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


Changeset:
Modified: branches/SAMBA_3_0/source/configure.in
===================================================================
--- branches/SAMBA_3_0/source/configure.in	2006-09-25 16:29:26 UTC (rev 18900)
+++ branches/SAMBA_3_0/source/configure.in	2006-09-25 16:47:50 UTC (rev 18901)
@@ -3141,6 +3141,7 @@
     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

Modified: branches/SAMBA_3_0/source/lib/ldb/common/ldb_modules.c
===================================================================
--- branches/SAMBA_3_0/source/lib/ldb/common/ldb_modules.c	2006-09-25 16:29:26 UTC (rev 18900)
+++ branches/SAMBA_3_0/source/lib/ldb/common/ldb_modules.c	2006-09-25 16:47:50 UTC (rev 18901)
@@ -137,13 +137,13 @@
 
 #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

Modified: branches/SAMBA_3_0/source/lib/ldb/configure.ac
===================================================================
--- branches/SAMBA_3_0/source/lib/ldb/configure.ac	2006-09-25 16:29:26 UTC (rev 18900)
+++ branches/SAMBA_3_0/source/lib/ldb/configure.ac	2006-09-25 16:47:50 UTC (rev 18901)
@@ -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_3_0/source/lib/ldb/ldap.m4
===================================================================
--- branches/SAMBA_3_0/source/lib/ldb/ldap.m4	2006-09-25 16:29:26 UTC (rev 18900)
+++ branches/SAMBA_3_0/source/lib/ldb/ldap.m4	2006-09-25 16:47:50 UTC (rev 18901)
@@ -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_3_0/source/lib/ldb/sqlite3.m4
===================================================================
--- branches/SAMBA_3_0/source/lib/ldb/sqlite3.m4	2006-09-25 16:29:26 UTC (rev 18900)
+++ branches/SAMBA_3_0/source/lib/ldb/sqlite3.m4	2006-09-25 16:47:50 UTC (rev 18901)
@@ -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