From 1acb65fdef88ef9c5f0b94b5e518b07c51fd2260 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 5 Sep 2006 11:52:28 +0000 Subject: r18082: bring talloc in line with new conventions (This used to be commit 7f7c85fa2feb1398050ea6b2929628f83b6bdb11) --- source4/lib/talloc/config.m4 | 23 ----------------------- source4/lib/talloc/configure.ac | 5 +++-- source4/lib/talloc/libtdb.m4 | 23 +++++++++++++++++++++++ 3 files changed, 26 insertions(+), 25 deletions(-) delete mode 100644 source4/lib/talloc/config.m4 create mode 100644 source4/lib/talloc/libtdb.m4 diff --git a/source4/lib/talloc/config.m4 b/source4/lib/talloc/config.m4 deleted file mode 100644 index 14e92b212c..0000000000 --- a/source4/lib/talloc/config.m4 +++ /dev/null @@ -1,23 +0,0 @@ -dnl find the talloc sources. This is meant to work both for -dnl talloc standalone builds, and builds of packages using talloc -tallocdir="" -for d in "$srcdir" "$srcdir/lib/talloc" "$srcdir/talloc" "$srcdir/../talloc"; do - if test -f "$d/talloc.c"; then - tallocdir="$d" - AC_SUBST(tallocdir) - break; - fi -done -TALLOCOBJ="talloc.o" -AC_SUBST(TALLOCOBJ) - -AC_CHECK_SIZEOF(size_t,cross) -AC_CHECK_SIZEOF(void *,cross) - -if test $ac_cv_sizeof_size_t -lt $ac_cv_sizeof_void_p; then - AC_WARN([size_t cannot represent the amount of used memory of a process]) - AC_WARN([please report this to ]) - AC_WARN([sizeof(size_t) = $ac_cv_sizeof_size_t]) - AC_WARN([sizeof(void *) = $ac_cv_sizeof_void_p]) - AC_ERROR([sizeof(size_t) < sizeof(void *)]) -fi 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/libtdb.m4 b/source4/lib/talloc/libtdb.m4 new file mode 100644 index 0000000000..14e92b212c --- /dev/null +++ b/source4/lib/talloc/libtdb.m4 @@ -0,0 +1,23 @@ +dnl find the talloc sources. This is meant to work both for +dnl talloc standalone builds, and builds of packages using talloc +tallocdir="" +for d in "$srcdir" "$srcdir/lib/talloc" "$srcdir/talloc" "$srcdir/../talloc"; do + if test -f "$d/talloc.c"; then + tallocdir="$d" + AC_SUBST(tallocdir) + break; + fi +done +TALLOCOBJ="talloc.o" +AC_SUBST(TALLOCOBJ) + +AC_CHECK_SIZEOF(size_t,cross) +AC_CHECK_SIZEOF(void *,cross) + +if test $ac_cv_sizeof_size_t -lt $ac_cv_sizeof_void_p; then + AC_WARN([size_t cannot represent the amount of used memory of a process]) + AC_WARN([please report this to ]) + AC_WARN([sizeof(size_t) = $ac_cv_sizeof_size_t]) + AC_WARN([sizeof(void *) = $ac_cv_sizeof_void_p]) + AC_ERROR([sizeof(size_t) < sizeof(void *)]) +fi -- cgit