svn commit: samba r7292 - in branches/SAMBA_4_0/source: . lib/ldb lib/ldb/ldb_sqlite3

abartlet at samba.org abartlet at samba.org
Sun Jun 5 04:18:58 GMT 2005


Author: abartlet
Date: 2005-06-05 04:18:57 +0000 (Sun, 05 Jun 2005)
New Revision: 7292

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

Log:
Fix up the build system support for derrell's sqlite3 ldb backend.

It is on by default, so I've also fixed a build issue in it.  I'll
show how to make it off be default in the next commit.

Andrew Bartlett

Modified:
   branches/SAMBA_4_0/source/configure.in
   branches/SAMBA_4_0/source/lib/ldb/ldb_sqlite3/ldb_sqlite3.c
   branches/SAMBA_4_0/source/lib/ldb/sqlite3.m4


Changeset:
Modified: branches/SAMBA_4_0/source/configure.in
===================================================================
--- branches/SAMBA_4_0/source/configure.in	2005-06-05 04:17:08 UTC (rev 7291)
+++ branches/SAMBA_4_0/source/configure.in	2005-06-05 04:18:57 UTC (rev 7292)
@@ -15,6 +15,8 @@
 sinclude(lib/socket/config.m4)
 sinclude(lib/talloc/config.m4)
 sinclude(lib/tdb/config.m4)
+sinclude(lib/ldb/ldap.m4)
+sinclude(lib/ldb/sqlite3.m4)
 sinclude(lib/ldb/config.m4)
 sinclude(lib/events/config.m4)
 sinclude(lib/cmdline/config.m4)

Modified: branches/SAMBA_4_0/source/lib/ldb/ldb_sqlite3/ldb_sqlite3.c
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/ldb_sqlite3/ldb_sqlite3.c	2005-06-05 04:17:08 UTC (rev 7291)
+++ branches/SAMBA_4_0/source/lib/ldb/ldb_sqlite3/ldb_sqlite3.c	2005-06-05 04:18:57 UTC (rev 7292)
@@ -35,6 +35,7 @@
 
 #include <stdarg.h>
 #include "includes.h"
+#include "system/filesys.h"
 #include "ldb/include/ldb.h"
 #include "ldb/include/ldb_private.h"
 #include "ldb/ldb_sqlite3/ldb_sqlite3.h"

Modified: branches/SAMBA_4_0/source/lib/ldb/sqlite3.m4
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/sqlite3.m4	2005-06-05 04:17:08 UTC (rev 7291)
+++ branches/SAMBA_4_0/source/lib/ldb/sqlite3.m4	2005-06-05 04:18:57 UTC (rev 7292)
@@ -39,11 +39,24 @@
   # now see if we can find the sqlite3 libs in standard paths
   AC_CHECK_LIB_EXT(sqlite3, SQLITE3_LIBS, sqlite3_open)
 
-  LIBS="$LIBS $SQLITE3_LIBS"
-  
-  AC_DEFINE(HAVE_SQLITE3,1,[Whether sqlite3 is available])
-  AC_MSG_CHECKING(whether SQLITE3 support is used)
-  AC_MSG_RESULT(yes)
+  if test x"$ac_cv_lib_ext_sqlite3_sqlite3_open" = x"yes"; then
+    AC_DEFINE(HAVE_SQLITE3,1,[Whether sqlite3 is available])
+    AC_MSG_CHECKING(whether SQLITE3 support is used)
+    AC_MSG_RESULT(yes)
+    with_sqlite3_support=yes
+    SMB_EXT_LIB_ENABLE(SQLITE3,YES)
+  else
+    if test x"$with_sqlite3_support" = x"yes"; then
+	AC_MSG_ERROR(libsqlite3 is needed for SQLITE3 support)
+    else
+	AC_MSG_WARN(libsqlite3 is needed for SQLITE3 support)
+    fi
+
+    SQLITE3_LIBS=""
+    with_sqlite3_support=no
+  fi
+
+  LIBS=$ac_save_LIBS;
 fi
 
 SMB_EXT_LIB(SQLITE3,[${SQLITE3_LIBS}],[${SQLITE3_CFLAGS}],[${SQLITE3_CPPFLAGS}],[${SQLITE3_LDFLAGS}])



More information about the samba-cvs mailing list