summaryrefslogtreecommitdiff
path: root/source4/lib
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-04-30 08:53:56 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:51:48 -0500
commitc9cf06b146c130b77a7fe2827b6e1b4c9d8f33d5 (patch)
tree32f8a8c44a1900a2ece240dac0848abf53d9b253 /source4/lib
parentb0411352a82ee181764ffb69bd2c5087702a26ac (diff)
downloadsamba-c9cf06b146c130b77a7fe2827b6e1b4c9d8f33d5.tar.gz
samba-c9cf06b146c130b77a7fe2827b6e1b4c9d8f33d5.tar.bz2
samba-c9cf06b146c130b77a7fe2827b6e1b4c9d8f33d5.zip
r22596: Set _CFLAGS variables rather than putting knowledge in the ldb Makefile.
This should make it easier to allow use of system tdb or talloc libs using pkg-config. (This used to be commit a3ec90a2635d47e5c073e873c15daab4a8ef5400)
Diffstat (limited to 'source4/lib')
-rw-r--r--source4/lib/ldb/Makefile.in13
-rw-r--r--source4/lib/talloc/libtalloc.m43
-rw-r--r--source4/lib/tdb/libtdb.m43
3 files changed, 17 insertions, 2 deletions
diff --git a/source4/lib/ldb/Makefile.in b/source4/lib/ldb/Makefile.in
index a091b4832e..d971581c41 100644
--- a/source4/lib/ldb/Makefile.in
+++ b/source4/lib/ldb/Makefile.in
@@ -18,11 +18,20 @@ SLAPD = @SLAPD@
EXTRA_OBJ=@EXTRA_OBJ@
TESTS=test-tdb.sh @TESTS@
+TALLOC_LIBS = @TALLOC_LIBS@
+TALLOC_CFLAGS = @TALLOC_CFLAGS@
+
+TDB_LIBS = @TDB_LIBS@
+TDB_CFLAGS = @TDB_CFLAGS@
+
+POPT_LIBS = @POPT_LIBS@
+POPT_CFLAGS = @POPT_CFLAGS@
+
CFLAGS=-g -I$(srcdir)/include -Iinclude -I$(srcdir) -I$(srcdir)/.. \
- @POPT_CFLAGS@ -I@tallocdir@ -I@tdbdir@/include -I@libreplacedir@ \
+ $(POPT_CFLAGS) $(TALLOC_CFLAGS) $(TDB_CFLAGS) -I@libreplacedir@ \
-DLIBDIR=\"$(libdir)\" -DSHLIBEXT=\"@SHLIBEXT@\" -DUSE_MMAP=1 @CFLAGS@
-LIB_FLAGS=@LDFLAGS@ -Llib -lldb @LIBS@ @POPT_LIBS@
+LIB_FLAGS=@LDFLAGS@ -Llib -lldb @LIBS@ $(POPT_LIBS)
LDB_TDB_DIR=ldb_tdb
LDB_TDB_OBJ=$(LDB_TDB_DIR)/ldb_tdb.o \
diff --git a/source4/lib/talloc/libtalloc.m4 b/source4/lib/talloc/libtalloc.m4
index 4a0ee3c8fc..d364729ec0 100644
--- a/source4/lib/talloc/libtalloc.m4
+++ b/source4/lib/talloc/libtalloc.m4
@@ -15,6 +15,9 @@ fi
TALLOCOBJ="talloc.o"
AC_SUBST(TALLOCOBJ)
+TALLOC_CFLAGS="-I$tallocdir"
+AC_SUBST(TALLOC_CFLAGS)
+
AC_CHECK_SIZEOF(size_t,cross)
AC_CHECK_SIZEOF(void *,cross)
diff --git a/source4/lib/tdb/libtdb.m4 b/source4/lib/tdb/libtdb.m4
index fefa5912c2..58523fc2dc 100644
--- a/source4/lib/tdb/libtdb.m4
+++ b/source4/lib/tdb/libtdb.m4
@@ -17,6 +17,9 @@ TDBOBJ="$TDBOBJ common/freelist.o common/freelistcheck.o common/io.o common/lock
AC_SUBST(TDBOBJ)
AC_SUBST(LIBREPLACEOBJ)
+TDB_CFLAGS="-I$tdbdir/include"
+AC_SUBST(TDB_CFLAGS)
+
AC_CHECK_FUNCS(mmap pread pwrite getpagesize utime)
AC_CHECK_HEADERS(getopt.h sys/select.h sys/time.h)