From 38fdde5d9bf15b10caa60ee216d278ba8d870c2e Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 4 Sep 2006 12:21:42 +0000 Subject: r18031: Merge my replace fixes: * libreplace can now build stand-alone * add stub testsuite for libreplace * make talloc/tdb/ldb use libreplace (This used to be commit fe7ca4b1454e01a33ed0d53791ebffdd349298b4) --- source4/lib/talloc/config.mk | 1 + source4/lib/talloc/configure.ac | 19 +++++++++++++++++++ source4/lib/talloc/configure.in | 19 ------------------- 3 files changed, 20 insertions(+), 19 deletions(-) create mode 100644 source4/lib/talloc/configure.ac delete mode 100644 source4/lib/talloc/configure.in (limited to 'source4/lib/talloc') diff --git a/source4/lib/talloc/config.mk b/source4/lib/talloc/config.mk index 8c704520f5..dc523d4ede 100644 --- a/source4/lib/talloc/config.mk +++ b/source4/lib/talloc/config.mk @@ -6,6 +6,7 @@ SO_VERSION = 0 OBJ_FILES = talloc.o PUBLIC_DEPENDENCIES = LIBREPLACE MANPAGE = talloc.3 +CFLAGS = -Ilib/talloc PUBLIC_HEADERS = talloc.h DESCRIPTION = A hierarchical pool based memory system with destructors # diff --git a/source4/lib/talloc/configure.ac b/source4/lib/talloc/configure.ac new file mode 100644 index 0000000000..253992cb1a --- /dev/null +++ b/source4/lib/talloc/configure.ac @@ -0,0 +1,19 @@ +AC_PREREQ(2.50) +AC_INIT(talloc.h) +AC_CONFIG_SRCDIR([talloc.c]) +AC_SUBST(datarootdir) +AC_PROG_CC +if test "x$GCC" = "xyes"; then + CFLAGS="$CFLAGS -Wall -W" +fi +AC_PROG_INSTALL +AC_PATH_PROG(XSLTPROC,xsltproc) +DOC_TARGET="" +if test -n "$XSLTPROC"; then + DOC_TARGET=doc +fi +AC_SUBST(DOC_TARGET) +AC_CONFIG_HEADER(config.h) +AC_SYS_LARGEFILE +sinclude(config.m4) +AC_OUTPUT(Makefile talloc.pc) diff --git a/source4/lib/talloc/configure.in b/source4/lib/talloc/configure.in deleted file mode 100644 index 253992cb1a..0000000000 --- a/source4/lib/talloc/configure.in +++ /dev/null @@ -1,19 +0,0 @@ -AC_PREREQ(2.50) -AC_INIT(talloc.h) -AC_CONFIG_SRCDIR([talloc.c]) -AC_SUBST(datarootdir) -AC_PROG_CC -if test "x$GCC" = "xyes"; then - CFLAGS="$CFLAGS -Wall -W" -fi -AC_PROG_INSTALL -AC_PATH_PROG(XSLTPROC,xsltproc) -DOC_TARGET="" -if test -n "$XSLTPROC"; then - DOC_TARGET=doc -fi -AC_SUBST(DOC_TARGET) -AC_CONFIG_HEADER(config.h) -AC_SYS_LARGEFILE -sinclude(config.m4) -AC_OUTPUT(Makefile talloc.pc) -- cgit