From 499f00b4d947b04ab9616a17d9e638caaec9e6f5 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sat, 23 Apr 2005 04:30:58 +0000 Subject: r6442: Add mechanism for configuring ldb independantly of the rest of Samba using the autoconf tools. (This used to be commit a8de35ca27e307d1be6ebad517b7012a5de30567) --- source4/lib/ldb/Makefile.in | 115 ++++++++++++++++++++++++++++++++++ source4/lib/ldb/Makefile.ldb | 110 -------------------------------- source4/lib/ldb/configure.in | 9 +++ source4/lib/ldb/man/build_manpages.sh | 11 ---- 4 files changed, 124 insertions(+), 121 deletions(-) create mode 100644 source4/lib/ldb/Makefile.in delete mode 100644 source4/lib/ldb/Makefile.ldb create mode 100644 source4/lib/ldb/configure.in delete mode 100755 source4/lib/ldb/man/build_manpages.sh diff --git a/source4/lib/ldb/Makefile.in b/source4/lib/ldb/Makefile.in new file mode 100644 index 0000000000..f07ab5a1d6 --- /dev/null +++ b/source4/lib/ldb/Makefile.in @@ -0,0 +1,115 @@ +CC = @CC@ +GCOV = @GCOV@ +YODL2MAN = @YODL2MAN@ + +ifeq ($(WITH_LDAP),1) +OPENLDAP_PREFIX=/usr +LDAP_LIBS=-L$(OPENLDAP_PREFIX)/lib -llber -lldap +LDAP_FLAGS=-DHAVE_LDAP=1 +LDB_LDAP_OBJ=ldb_ldap/ldb_ldap.o +endif + +TDBDIR=../tdb +TALLOCDIR=../talloc + +CFLAGS1=-Wall -Wall -Wshadow -Wstrict-prototypes -Wpointer-arith \ + -Wcast-qual -Wcast-align -Wwrite-strings -g -Iinclude -I. -I.. \ + -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 + +CFLAGS = $(CFLAGS1) $(GCOV_FLAGS) @CFLAGS@ + +LIB_FLAGS=-Llib -lldb $(LDAP_LIBS) $(GCOV_LIBS) + +TDB_OBJ=$(TDBDIR)/common/tdb.o $(TDBDIR)/common/spinlock.o +TALLOC_OBJ=$(TALLOCDIR)/talloc.o + +LDB_TDB_OBJ=ldb_tdb/ldb_match.o ldb_tdb/ldb_tdb.o \ + ldb_tdb/ldb_pack.o ldb_tdb/ldb_search.o ldb_tdb/ldb_index.o \ + ldb_tdb/ldb_cache.o + + +COMMON_OBJ=common/ldb.o common/ldb_ldif.o common/util.o \ + common/ldb_parse.o common/ldb_msg.o common/ldb_utf8.o \ + common/ldb_debug.o common/ldb_modules.o + +MODULES_OBJ=modules/timestamps.o modules/schema.o + +OBJS = $(MODULES_OBJ) $(COMMON_OBJ) $(LDB_TDB_OBJ) $(TDB_OBJ) $(TALLOC_OBJ) $(LDB_LDAP_OBJ) + +LDB_LIB = lib/libldb.a + +BINS = bin/ldbadd bin/ldbsearch bin/ldbdel bin/ldbmodify bin/ldbedit bin/ldbrename bin/ldbtest + +LIBS = $(LDB_LIB)($(OBJS)) + +DIRS = lib bin + +all: $(DIRS) $(BINS) $(LIBS) manpages + +lib: + mkdir -p lib + +bin: + mkdir -p bin + +lib/libldb.a: $(OBJS) + +bin/ldbadd: tools/ldbadd.o $(LIBS) + $(CC) -o bin/ldbadd tools/ldbadd.o $(LIB_FLAGS) + +bin/ldbsearch: tools/ldbsearch.o $(LIBS) + $(CC) -o bin/ldbsearch tools/ldbsearch.o $(LIB_FLAGS) + +bin/ldbdel: tools/ldbdel.o $(LIBS) + $(CC) -o bin/ldbdel tools/ldbdel.o $(LIB_FLAGS) + +bin/ldbmodify: tools/ldbmodify.o $(LIBS) + $(CC) -o bin/ldbmodify tools/ldbmodify.o $(LIB_FLAGS) + +bin/ldbedit: tools/ldbedit.o $(LIBS) + $(CC) -o bin/ldbedit tools/ldbedit.o $(LIB_FLAGS) + +bin/ldbrename: tools/ldbrename.o $(LIBS) + $(CC) -o bin/ldbrename tools/ldbrename.o $(LIB_FLAGS) + +bin/ldbtest: tools/ldbtest.o $(LIBS) + $(CC) -o bin/ldbtest tools/ldbtest.o $(LIB_FLAGS) + +.SUFFIXES: .1 .2 .3 .yo + +.yo.3: + echo Creating $@ from $< + -$(YODL2MAN) -o $@ `dirname $<`/`basename $< .yo` || rm -f $@ + +manpages: $(patsubst %.yo,%.3,$(wildcard man/man3/*.yo)) + +clean: + rm -f */*.o *.gcov */*.gc?? *~ */*~ $(BINS) $(TDB_OBJ) $(TALLOC_OBJ) $(LDB_LIB) man/man?/*.[13] + +etags: + etags */*.[ch] + +test-tdb: + @echo "STARTING TDB BACKEND TEST" + tests/test-tdb.sh + +test-ldap: + @echo "STARTING LDAP BACKEND TEST" + tests/test-ldap.sh + +test-schema: + @echo "STARTING SCHEMA MODULE TEST" + tests/test-schema.sh + +test: test-tdb test-ldap test-schema + +gcov: + $(GCOV) -po ldb_ldap ldb_ldap/*.c 2| tee ldb_ldap.report.gcov + $(GCOV) -po ldb_tdb ldb_tdb/*.c 2| tee ldb_tdb.report.gcov + $(GCOV) -po common common/*.c 2| tee common.report.gcov + $(GCOV) -po modules modules/*.c 2| tee modules.report.gcov + $(GCOV) -po tools tools/*.c 2| tee tools.report.gcov diff --git a/source4/lib/ldb/Makefile.ldb b/source4/lib/ldb/Makefile.ldb deleted file mode 100644 index 791a345f72..0000000000 --- a/source4/lib/ldb/Makefile.ldb +++ /dev/null @@ -1,110 +0,0 @@ - -# ldap support is optional edit WITH_LDAP to suit -WITH_LDAP=1 - -ifeq ($(WITH_LDAP),1) -OPENLDAP_PREFIX=/usr -LDAP_LIBS=-L$(OPENLDAP_PREFIX)/lib -llber -lldap -LDAP_FLAGS=-DHAVE_LDAP=1 -LDB_LDAP_OBJ=ldb_ldap/ldb_ldap.o -endif - -TDBDIR=../tdb -TALLOCDIR=../talloc - -CFLAGS1=-Wall -Wall -Wshadow -Wstrict-prototypes -Wpointer-arith \ - -Wcast-qual -Wcast-align -Wwrite-strings -g -Iinclude -I. -I.. \ - -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 - -CFLAGS = $(CFLAGS1) $(GCOV_FLAGS) - -LIB_FLAGS=-Llib -lldb $(LDAP_LIBS) $(GCOV_LIBS) - -TDB_OBJ=$(TDBDIR)/common/tdb.o $(TDBDIR)/common/spinlock.o -TALLOC_OBJ=$(TALLOCDIR)/talloc.o - -LDB_TDB_OBJ=ldb_tdb/ldb_match.o ldb_tdb/ldb_tdb.o \ - ldb_tdb/ldb_pack.o ldb_tdb/ldb_search.o ldb_tdb/ldb_index.o \ - ldb_tdb/ldb_cache.o - - -COMMON_OBJ=common/ldb.o common/ldb_ldif.o common/util.o \ - common/ldb_parse.o common/ldb_msg.o common/ldb_utf8.o \ - common/ldb_debug.o common/ldb_modules.o - -MODULES_OBJ=modules/timestamps.o modules/schema.o - -OBJS = $(MODULES_OBJ) $(COMMON_OBJ) $(LDB_TDB_OBJ) $(TDB_OBJ) $(TALLOC_OBJ) $(LDB_LDAP_OBJ) - -LDB_LIB = lib/libldb.a - -BINS = bin/ldbadd bin/ldbsearch bin/ldbdel bin/ldbmodify bin/ldbedit bin/ldbrename bin/ldbtest - -LIBS = $(LDB_LIB)($(OBJS)) - -DIRS = lib bin - -all: $(DIRS) $(BINS) $(LIBS) manpages - -lib: - mkdir -p lib - -bin: - mkdir -p bin - -lib/libldb.a: $(OBJS) - -bin/ldbadd: tools/ldbadd.o $(LIBS) - $(CC) -o bin/ldbadd tools/ldbadd.o $(LIB_FLAGS) - -bin/ldbsearch: tools/ldbsearch.o $(LIBS) - $(CC) -o bin/ldbsearch tools/ldbsearch.o $(LIB_FLAGS) - -bin/ldbdel: tools/ldbdel.o $(LIBS) - $(CC) -o bin/ldbdel tools/ldbdel.o $(LIB_FLAGS) - -bin/ldbmodify: tools/ldbmodify.o $(LIBS) - $(CC) -o bin/ldbmodify tools/ldbmodify.o $(LIB_FLAGS) - -bin/ldbedit: tools/ldbedit.o $(LIBS) - $(CC) -o bin/ldbedit tools/ldbedit.o $(LIB_FLAGS) - -bin/ldbrename: tools/ldbrename.o $(LIBS) - $(CC) -o bin/ldbrename tools/ldbrename.o $(LIB_FLAGS) - -bin/ldbtest: tools/ldbtest.o $(LIBS) - $(CC) -o bin/ldbtest tools/ldbtest.o $(LIB_FLAGS) - -manpages: - -man/build_manpages.sh - -clean: - rm -f */*.o *.gcov */*.gc?? *~ */*~ $(BINS) $(TDB_OBJ) $(TALLOC_OBJ) $(LDB_LIB) man/man?/*.[13] - -etags: - etags */*.[ch] - -test-tdb: - @echo "STARTING TDB BACKEND TEST" - tests/test-tdb.sh - -test-ldap: - @echo "STARTING LDAP BACKEND TEST" - tests/test-ldap.sh - -test-schema: - @echo "STARTING SCHEMA MODULE TEST" - tests/test-schema.sh - -test: test-tdb test-ldap test-schema - -gcov: - gcov -po ldb_ldap ldb_ldap/*.c 2| tee ldb_ldap.report.gcov - gcov -po ldb_tdb ldb_tdb/*.c 2| tee ldb_tdb.report.gcov - gcov -po common common/*.c 2| tee common.report.gcov - gcov -po modules modules/*.c 2| tee modules.report.gcov - gcov -po tools tools/*.c 2| tee tools.report.gcov diff --git a/source4/lib/ldb/configure.in b/source4/lib/ldb/configure.in new file mode 100644 index 0000000000..94afebb9f5 --- /dev/null +++ b/source4/lib/ldb/configure.in @@ -0,0 +1,9 @@ +AC_DEFUN([SMB_MODULE_DEFAULT], [echo -n ""]) +AC_DEFUN([SMB_LIBRARY_ENABLE], [echo -n ""]) +AC_INIT(include/ldb.h) +AC_FUNC_MMAP +AC_PATH_PROG(YODL2MAN,yodl2man) +AC_PATH_PROG(GCOV,gcov) +AC_PROG_CC +sinclude(config.m4) +AC_OUTPUT(Makefile) diff --git a/source4/lib/ldb/man/build_manpages.sh b/source4/lib/ldb/man/build_manpages.sh deleted file mode 100755 index 5e5e698ac4..0000000000 --- a/source4/lib/ldb/man/build_manpages.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh - -for f in man/man3/*.yo; do - base=`basename $f .yo`; - man=man/man3/$base.3; - - if test $f -nt $man; then - echo Creating $man from $f - yodl2man -o $man $f || rm -f $man - fi -done -- cgit