From 6c1bcc6521c819da08813b645133e113eb4833f6 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 5 Sep 2006 12:01:18 +0000 Subject: r18083: i should sleep more .... (This used to be commit 9bc583cf6c66130df4b9fd2ee1ab3ea486e22b8a) --- source4/lib/talloc/configure.ac | 2 +- source4/lib/talloc/libtalloc.m4 | 23 +++++++++++++++++++++++ source4/lib/talloc/libtdb.m4 | 23 ----------------------- 3 files changed, 24 insertions(+), 24 deletions(-) create mode 100644 source4/lib/talloc/libtalloc.m4 delete mode 100644 source4/lib/talloc/libtdb.m4 diff --git a/source4/lib/talloc/configure.ac b/source4/lib/talloc/configure.ac index 9c81382884..8b33fe0b1a 100644 --- a/source4/lib/talloc/configure.ac +++ b/source4/lib/talloc/configure.ac @@ -17,6 +17,6 @@ AC_CONFIG_HEADER(config.h) AC_SYS_LARGEFILE sinclude(libreplace.m4) -sinclude(libtdb.m4) +sinclude(libtalloc.m4) AC_OUTPUT(Makefile talloc.pc) diff --git a/source4/lib/talloc/libtalloc.m4 b/source4/lib/talloc/libtalloc.m4 new file mode 100644 index 0000000000..14e92b212c --- /dev/null +++ b/source4/lib/talloc/libtalloc.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 diff --git a/source4/lib/talloc/libtdb.m4 b/source4/lib/talloc/libtdb.m4 deleted file mode 100644 index 14e92b212c..0000000000 --- a/source4/lib/talloc/libtdb.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 -- cgit