From fee4ba14c04e25f459723d87114cd9779f9c2f11 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Mon, 11 Feb 2008 12:50:03 +0100 Subject: Make versions in lib/talloc/config.mk and lib/talloc/configure.ac the same. Not sure if we can produce one from the other, so I manually made them equal for now. Michael (This used to be commit 1c14c457bea75fb3055712547cca501e8ef3fc20) --- source4/lib/talloc/config.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/lib/talloc/config.mk') diff --git a/source4/lib/talloc/config.mk b/source4/lib/talloc/config.mk index 16b5063f87..9e949f900f 100644 --- a/source4/lib/talloc/config.mk +++ b/source4/lib/talloc/config.mk @@ -1,5 +1,5 @@ [LIBRARY::LIBTALLOC] -VERSION = 1.0.0 +VERSION = 1.1.0 SO_VERSION = 1 OBJ_FILES = talloc.o PC_FILE = 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/config.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source4/lib/talloc/config.mk') diff --git a/source4/lib/talloc/config.mk b/source4/lib/talloc/config.mk index 9e949f900f..540a05d100 100644 --- a/source4/lib/talloc/config.mk +++ b/source4/lib/talloc/config.mk @@ -1,5 +1,5 @@ [LIBRARY::LIBTALLOC] -VERSION = 1.1.0 +VERSION = 1.2.0 SO_VERSION = 1 OBJ_FILES = talloc.o PC_FILE = talloc.pc -- cgit From 11bc6056ea2eec9eb9a206fa5ae2a2b6b3efe21a Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Wed, 13 Feb 2008 17:01:37 +0100 Subject: Never build .so versions of tdb/talloc from Samba 4 itself. Rather, use shared library versions if they are provided by the system. This puts talloc and tdb in a similar situation as popt: the system version is used if provided but if it's not there or if it is too old, we use our internal version statically. (This used to be commit 86f88eb7b51377344eebf0b6fabad0f5459b3f45) --- source4/lib/talloc/config.mk | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'source4/lib/talloc/config.mk') diff --git a/source4/lib/talloc/config.mk b/source4/lib/talloc/config.mk index 540a05d100..af1b590c98 100644 --- a/source4/lib/talloc/config.mk +++ b/source4/lib/talloc/config.mk @@ -1,8 +1,6 @@ [LIBRARY::LIBTALLOC] -VERSION = 1.2.0 -SO_VERSION = 1 +OUTPUT_TYPE = STATIC_LIBRARY OBJ_FILES = talloc.o -PC_FILE = talloc.pc MANPAGE = talloc.3 CFLAGS = -Ilib/talloc PUBLIC_HEADERS = talloc.h -- cgit