summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2006-09-05 11:52:28 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:17:13 -0500
commit1acb65fdef88ef9c5f0b94b5e518b07c51fd2260 (patch)
treea978fd2e7cef6115e012aa5e5d68efb40ff9f43c
parentb5c0202bff42fe5792d0e58b0349527da5ae4ff9 (diff)
downloadsamba-1acb65fdef88ef9c5f0b94b5e518b07c51fd2260.tar.gz
samba-1acb65fdef88ef9c5f0b94b5e518b07c51fd2260.tar.bz2
samba-1acb65fdef88ef9c5f0b94b5e518b07c51fd2260.zip
r18082: bring talloc in line with new conventions
(This used to be commit 7f7c85fa2feb1398050ea6b2929628f83b6bdb11)
-rw-r--r--source4/lib/talloc/configure.ac5
-rw-r--r--source4/lib/talloc/libtdb.m4 (renamed from source4/lib/talloc/config.m4)0
2 files changed, 3 insertions, 2 deletions
diff --git a/source4/lib/talloc/configure.ac b/source4/lib/talloc/configure.ac
index 59b9e4470a..9c81382884 100644
--- a/source4/lib/talloc/configure.ac
+++ b/source4/lib/talloc/configure.ac
@@ -13,9 +13,10 @@ if test -n "$XSLTPROC"; then
DOC_TARGET=doc
fi
AC_SUBST(DOC_TARGET)
-AC_CONFIG_HEADER(talloc_config.h)
+AC_CONFIG_HEADER(config.h)
AC_SYS_LARGEFILE
-sinclude(config.m4)
sinclude(libreplace.m4)
+sinclude(libtdb.m4)
+
AC_OUTPUT(Makefile talloc.pc)
diff --git a/source4/lib/talloc/config.m4 b/source4/lib/talloc/libtdb.m4
index 14e92b212c..14e92b212c 100644
--- a/source4/lib/talloc/config.m4
+++ b/source4/lib/talloc/libtdb.m4