svn commit: samba r6546 - in branches/SAMBA_4_0/source/lib: ldb tdb

[jelmer at samba.org]

Author: jelmer
Date: 2005-05-01 09:04:51 +0000 (Sun, 01 May 2005)
New Revision: 6546

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

Log:
Fix ldb standalone build
Add autoconf to tdb

Added:
   branches/SAMBA_4_0/source/lib/tdb/Makefile.in
   branches/SAMBA_4_0/source/lib/tdb/configure.in
Removed:
   branches/SAMBA_4_0/source/lib/tdb/Makefile.tdb
Modified:
   branches/SAMBA_4_0/source/lib/ldb/Makefile.in
   branches/SAMBA_4_0/source/lib/ldb/configure.in


Changeset:
Modified: branches/SAMBA_4_0/source/lib/ldb/Makefile.in
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/Makefile.in	2005-05-01 08:52:41 UTC (rev 6545)
+++ branches/SAMBA_4_0/source/lib/ldb/Makefile.in	2005-05-01 09:04:51 UTC (rev 6546)
@@ -6,6 +6,7 @@
 includedir = @includedir@
 libdir = @libdir@
 bindir = @bindir@
+WITH_GCOV = @WITH_GCOV@
 
 ifeq ($(WITH_LDAP),1)
 OPENLDAP_PREFIX=/usr
@@ -22,8 +23,10 @@
        -I$(TDBDIR)/include -I$(TALLOCDIR) -DUSE_MMAP=1 $(LDAP_FLAGS)
 
 # enable the following two lines to build with gcov code coverage support
-#GCOV_FLAGS = -ftest-coverage -fprofile-arcs 
-#GCOV_LIBS = -lgcov
+ifeq ($(WITH_GCOV),1)
+GCOV_FLAGS = -ftest-coverage -fprofile-arcs 
+GCOV_LIBS = -lgcov
+endif
 
 CFLAGS = $(CFLAGS1) $(GCOV_FLAGS) @CFLAGS@
 

Modified: branches/SAMBA_4_0/source/lib/ldb/configure.in
===================================================================
--- branches/SAMBA_4_0/source/lib/ldb/configure.in	2005-05-01 08:52:41 UTC (rev 6545)
+++ branches/SAMBA_4_0/source/lib/ldb/configure.in	2005-05-01 09:04:51 UTC (rev 6546)
@@ -1,6 +1,21 @@
+AC_DEFUN([AC_CHECK_LIB_EXT], [
+	AC_CHECK_LIB([$1],[$3],[$4],[$5],[$7])
+	ac_cv_lib_ext_$1_$3=$ac_cv_lib_$1_$3
+])
+AC_DEFUN([AC_CHECK_FUNC_EXT], [
+	AC_CHECK_FUNC([$1],[$3],[$4])
+	ac_cv_func_ext_$1=$ac_cv_func_$1
+])
 AC_DEFUN([SMB_MODULE_DEFAULT], [echo -n ""])
 AC_DEFUN([SMB_LIBRARY_ENABLE], [echo -n ""])
+AC_DEFUN([SMB_EXT_LIB_ENABLE], [echo -n ""])
+AC_DEFUN([SMB_EXT_LIB], [echo -n ""])
 AC_INIT(include/ldb.h)
+WITH_GCOV=0
+AC_ARG_ENABLE(gcov,
+	[  --enable-gcov	Enable GCOV code coverage tests],
+	[ WITH_GCOV=1])
+AC_SUBST(WITH_GCOV)
 AC_PROG_CC
 AC_FUNC_MMAP
 AC_PATH_PROG(YODL2MAN,yodl2man)

Added: branches/SAMBA_4_0/source/lib/tdb/Makefile.in
===================================================================
--- branches/SAMBA_4_0/source/lib/tdb/Makefile.in	2005-05-01 08:52:41 UTC (rev 6545)
+++ branches/SAMBA_4_0/source/lib/tdb/Makefile.in	2005-05-01 09:04:51 UTC (rev 6546)
@@ -0,0 +1,39 @@
+#
+# Makefile for tdb directory
+#
+
+CFLAGS = -DTDB_DEBUG -g -Iinclude
+CC = @CC@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+bindir = @bindir@
+includedir = @includedir@
+libdir = @libdir@
+
+PROGS = bin/tdbtest bin/tdbtool bin/tdbtorture
+TDB_OBJ = common/tdb.o common/spinlock.o
+
+all: $(PROGS)
+
+install: all
+	cp $(PROGS) $(bindir)
+	cp include/tdb.h $(includedir)
+	cp tdb.pc $(libdir)/pkgconfig
+
+bin/tdbtest: tools/tdbtest.o $(TDB_OBJ)
+	$(CC) $(CFLAGS) -o bin/tdbtest tools/tdbtest.o $(TDB_OBJ) -lgdbm
+
+bin/tdbtool: tools/tdbtool.o $(TDB_OBJ)
+	$(CC) $(CFLAGS) -o bin/tdbtool tools/tdbtool.o $(TDB_OBJ)
+
+bin/tdbtorture: tools/tdbtorture.o $(TDB_OBJ)
+	$(CC) $(CFLAGS) -o bin/tdbtorture tools/tdbtorture.o $(TDB_OBJ)
+
+bin/tdbdump: tools/tdbdump.o $(TDB_OBJ)
+	$(CC) $(CFLAGS) -o bin/tdbdump tools/tdbdump.o $(TDB_OBJ)
+
+bin/tdbbackup: tools/tdbbackup.o $(TDB_OBJ)
+	$(CC) $(CFLAGS) -o bin/tdbbackup tools/tdbbackup.o $(TDB_OBJ)
+
+clean:
+	rm -f $(PROGS) common/*.o tools/*.o *~ *.bak */*~ */*.bak *% core test.db test.tdb test.gdbm

Deleted: branches/SAMBA_4_0/source/lib/tdb/Makefile.tdb
===================================================================
--- branches/SAMBA_4_0/source/lib/tdb/Makefile.tdb	2005-05-01 08:52:41 UTC (rev 6545)
+++ branches/SAMBA_4_0/source/lib/tdb/Makefile.tdb	2005-05-01 09:04:51 UTC (rev 6546)
@@ -1,29 +0,0 @@
-#
-# Makefile for tdb directory
-#
-
-CFLAGS = -DTDB_DEBUG -g -DHAVE_MMAP=1 -Iinclude
-CC = gcc
-
-PROGS = bin/tdbtest bin/tdbtool bin/tdbtorture
-TDB_OBJ = common/tdb.o common/spinlock.o
-
-all: $(PROGS)
-
-bin/tdbtest: tools/tdbtest.o $(TDB_OBJ)
-	$(CC) $(CFLAGS) -o bin/tdbtest tools/tdbtest.o $(TDB_OBJ) -lgdbm
-
-bin/tdbtool: tools/tdbtool.o $(TDB_OBJ)
-	$(CC) $(CFLAGS) -o bin/tdbtool tools/tdbtool.o $(TDB_OBJ)
-
-bin/tdbtorture: tools/tdbtorture.o $(TDB_OBJ)
-	$(CC) $(CFLAGS) -o bin/tdbtorture tools/tdbtorture.o $(TDB_OBJ)
-
-bin/tdbdump: tools/tdbdump.o $(TDB_OBJ)
-	$(CC) $(CFLAGS) -o bin/tdbdump tools/tdbdump.o $(TDB_OBJ)
-
-bin/tdbbackup: tools/tdbbackup.o $(TDB_OBJ)
-	$(CC) $(CFLAGS) -o bin/tdbbackup tools/tdbbackup.o $(TDB_OBJ)
-
-clean:
-	rm -f $(PROGS) common/*.o tools/*.o *~ *.bak */*~ */*.bak *% core test.db test.tdb test.gdbm

Added: branches/SAMBA_4_0/source/lib/tdb/configure.in
===================================================================
--- branches/SAMBA_4_0/source/lib/tdb/configure.in	2005-05-01 08:52:41 UTC (rev 6545)
+++ branches/SAMBA_4_0/source/lib/tdb/configure.in	2005-05-01 09:04:51 UTC (rev 6546)
@@ -0,0 +1,7 @@
+AC_DEFUN([SMB_MODULE_DEFAULT], [echo -n ""])
+AC_DEFUN([SMB_LIBRARY_ENABLE], [echo -n ""])
+AC_INIT(include/tdb.h)
+AC_PROG_CC
+AC_FUNC_MMAP
+sinclude(config.m4)
+AC_OUTPUT(Makefile tdb.pc)