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/configure.ac | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 source4/lib/talloc/configure.ac (limited to 'source4/lib/talloc/configure.ac') 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) -- cgit From 9b10009938612ff8796ffdda0d666ef9060ba534 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 5 Sep 2006 11:34:43 +0000 Subject: r18076: convert talloc to the new libreplace system (This used to be commit 968a4e97cfa6585b06f0c5e64d746715a1297461) --- source4/lib/talloc/configure.ac | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'source4/lib/talloc/configure.ac') diff --git a/source4/lib/talloc/configure.ac b/source4/lib/talloc/configure.ac index 253992cb1a..59b9e4470a 100644 --- a/source4/lib/talloc/configure.ac +++ b/source4/lib/talloc/configure.ac @@ -13,7 +13,9 @@ if test -n "$XSLTPROC"; then DOC_TARGET=doc fi AC_SUBST(DOC_TARGET) -AC_CONFIG_HEADER(config.h) +AC_CONFIG_HEADER(talloc_config.h) AC_SYS_LARGEFILE sinclude(config.m4) + +sinclude(libreplace.m4) AC_OUTPUT(Makefile talloc.pc) -- cgit 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/configure.ac | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'source4/lib/talloc/configure.ac') 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) -- cgit 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 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/lib/talloc/configure.ac') 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) -- cgit From 9105f1323b89d93c2363f04c1660ebbb3b7c9c6c Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 5 Sep 2006 12:13:34 +0000 Subject: r18086: here too (This used to be commit e485b25a39ebbbfaf150fad1946e138830bdbfec) --- source4/lib/talloc/configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source4/lib/talloc/configure.ac') diff --git a/source4/lib/talloc/configure.ac b/source4/lib/talloc/configure.ac index 8b33fe0b1a..a8b446169e 100644 --- a/source4/lib/talloc/configure.ac +++ b/source4/lib/talloc/configure.ac @@ -16,7 +16,7 @@ AC_SUBST(DOC_TARGET) AC_CONFIG_HEADER(config.h) AC_SYS_LARGEFILE -sinclude(libreplace.m4) -sinclude(libtalloc.m4) +m4_include(libreplace.m4) +m4_include(libtalloc.m4) AC_OUTPUT(Makefile talloc.pc) -- cgit From e6b457d55031f1987c8fa5719c5bbf46743281a0 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sat, 9 Sep 2006 02:52:41 +0000 Subject: r18283: libreplace.m4 needs to be early in configure.ac in other packages too (This used to be commit 03f9c67c066d772d9a544f1183fbee609ab8137b) --- source4/lib/talloc/configure.ac | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'source4/lib/talloc/configure.ac') diff --git a/source4/lib/talloc/configure.ac b/source4/lib/talloc/configure.ac index a8b446169e..acde824b87 100644 --- a/source4/lib/talloc/configure.ac +++ b/source4/lib/talloc/configure.ac @@ -2,21 +2,16 @@ 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_CONFIG_HEADER(config.h) + +m4_include(libreplace.m4) +m4_include(libtalloc.m4) + 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 - -m4_include(libreplace.m4) -m4_include(libtalloc.m4) AC_OUTPUT(Makefile talloc.pc) -- cgit From d08fb7b1cc39f4fa92045a4789fcf6182caba907 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 13 Sep 2006 16:51:45 +0000 Subject: r18485: include libreplace.m4 in the aclocal.m4 files and use the macros in configure.ac metze (This used to be commit 95d33e4d71b4c97af8413bcd136f393aa3e380dd) --- source4/lib/talloc/configure.ac | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'source4/lib/talloc/configure.ac') diff --git a/source4/lib/talloc/configure.ac b/source4/lib/talloc/configure.ac index acde824b87..51e7256bf8 100644 --- a/source4/lib/talloc/configure.ac +++ b/source4/lib/talloc/configure.ac @@ -4,7 +4,8 @@ AC_CONFIG_SRCDIR([talloc.c]) AC_SUBST(datarootdir) AC_CONFIG_HEADER(config.h) -m4_include(libreplace.m4) +AC_LIBREPLACE_ALL_CHECKS + m4_include(libtalloc.m4) AC_PATH_PROG(XSLTPROC,xsltproc) -- cgit From 4b0820f9adac8a579f763ee8caf60bff52f2b84d Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Wed, 25 Apr 2007 12:30:25 +0000 Subject: r22514: Add version numbers to tdb and talloc (required so they can be packaged independent of Samba for Debian). (This used to be commit 846cfcf44df07457d228c9a5afab743e071ab7aa) --- source4/lib/talloc/configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/lib/talloc/configure.ac') diff --git a/source4/lib/talloc/configure.ac b/source4/lib/talloc/configure.ac index 51e7256bf8..5f465fe93a 100644 --- a/source4/lib/talloc/configure.ac +++ b/source4/lib/talloc/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ(2.50) -AC_INIT(talloc.h) +AC_INIT(talloc, 1.0) AC_CONFIG_SRCDIR([talloc.c]) AC_SUBST(datarootdir) AC_CONFIG_HEADER(config.h) -- cgit From e3af07d1b1756f3e723f276ff4362ec784680faf Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sat, 26 May 2007 16:56:54 +0000 Subject: r23158: Set version to 1.0.1. (This used to be commit db065db67a5edcefc6dbe2e504a4922b9b9f7f21) --- source4/lib/talloc/configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/lib/talloc/configure.ac') diff --git a/source4/lib/talloc/configure.ac b/source4/lib/talloc/configure.ac index 5f465fe93a..e1e84b25c3 100644 --- a/source4/lib/talloc/configure.ac +++ b/source4/lib/talloc/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ(2.50) -AC_INIT(talloc, 1.0) +AC_INIT(talloc, 1.0.1) AC_CONFIG_SRCDIR([talloc.c]) AC_SUBST(datarootdir) AC_CONFIG_HEADER(config.h) -- cgit From 122888052f1b1e230c12d8eedde931ea1c897261 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 16 Sep 2007 14:34:33 +0000 Subject: r25190: Update talloc version to 1.1.0 after API-incompatible changes. (This used to be commit 66000a1fa2365cd8a08e3ecaaa116b27eb74e8b8) --- source4/lib/talloc/configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/lib/talloc/configure.ac') diff --git a/source4/lib/talloc/configure.ac b/source4/lib/talloc/configure.ac index e1e84b25c3..afc2a944f0 100644 --- a/source4/lib/talloc/configure.ac +++ b/source4/lib/talloc/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ(2.50) -AC_INIT(talloc, 1.0.1) +AC_INIT(talloc, 1.1.0) AC_CONFIG_SRCDIR([talloc.c]) AC_SUBST(datarootdir) AC_CONFIG_HEADER(config.h) -- cgit From 4347f8fc37d5dd7315113ff4b8ce80a5427b53b9 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 6 Nov 2007 19:24:12 +0100 Subject: r25882: Build shared library of talloc as well. (This used to be commit 3692ba8299d4177289ca401fa467143ad14ccad4) --- source4/lib/talloc/configure.ac | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'source4/lib/talloc/configure.ac') diff --git a/source4/lib/talloc/configure.ac b/source4/lib/talloc/configure.ac index afc2a944f0..d76052007c 100644 --- a/source4/lib/talloc/configure.ac +++ b/source4/lib/talloc/configure.ac @@ -15,4 +15,9 @@ if test -n "$XSLTPROC"; then fi AC_SUBST(DOC_TARGET) +AC_LD_PICFLAG +AC_LD_SHLIBEXT +AC_LD_SONAMEFLAG +AC_LD_SHLDFLAGS + AC_OUTPUT(Makefile talloc.pc) -- cgit From 676bb230fcb310e56ef6cc9f15e257ffca4304ba Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Fri, 16 Nov 2007 10:10:58 +0100 Subject: r25987: libreplace: rename AC_LD_SHLDFLAGS into AC_LIBREPLACE_SHLD_FLAGS metze (This used to be commit 410cdf789a72209f9e10321519fe18ab40a43f95) --- source4/lib/talloc/configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/lib/talloc/configure.ac') diff --git a/source4/lib/talloc/configure.ac b/source4/lib/talloc/configure.ac index d76052007c..e5f9575f22 100644 --- a/source4/lib/talloc/configure.ac +++ b/source4/lib/talloc/configure.ac @@ -18,6 +18,6 @@ AC_SUBST(DOC_TARGET) AC_LD_PICFLAG AC_LD_SHLIBEXT AC_LD_SONAMEFLAG -AC_LD_SHLDFLAGS +AC_LIBREPLACE_SHLD_FLAGS AC_OUTPUT(Makefile talloc.pc) -- cgit From 08d4a44f927b52bcb16c8cc81cf849dcffa01061 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Fri, 16 Nov 2007 10:17:26 +0100 Subject: r25990: talloc: use AC_LIBREPLACE_SHLD and use it for linking the shared library metze (This used to be commit c179807165b84dd832ab64f794034960668e5957) --- source4/lib/talloc/configure.ac | 1 + 1 file changed, 1 insertion(+) (limited to 'source4/lib/talloc/configure.ac') diff --git a/source4/lib/talloc/configure.ac b/source4/lib/talloc/configure.ac index e5f9575f22..7878d59300 100644 --- a/source4/lib/talloc/configure.ac +++ b/source4/lib/talloc/configure.ac @@ -18,6 +18,7 @@ AC_SUBST(DOC_TARGET) AC_LD_PICFLAG AC_LD_SHLIBEXT AC_LD_SONAMEFLAG +AC_LIBREPLACE_SHLD AC_LIBREPLACE_SHLD_FLAGS AC_OUTPUT(Makefile talloc.pc) -- cgit From 3cfac63d165f072464e93a12f7ad48450c66477b Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Tue, 12 Feb 2008 22:52:58 +0100 Subject: Raise version of talloc from 1.1.0 to 1.2.0 after adding talloc pools. Michael (This used to be commit 38855a9f145b54d05f4a508562fc1a6595e0d895) --- source4/lib/talloc/configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/lib/talloc/configure.ac') diff --git a/source4/lib/talloc/configure.ac b/source4/lib/talloc/configure.ac index 7878d59300..4719aa04b5 100644 --- a/source4/lib/talloc/configure.ac +++ b/source4/lib/talloc/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ(2.50) -AC_INIT(talloc, 1.1.0) +AC_INIT(talloc, 1.2.0) AC_CONFIG_SRCDIR([talloc.c]) AC_SUBST(datarootdir) AC_CONFIG_HEADER(config.h) -- cgit