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)

diff --git a/source4/configure.ac b/source4/configure.ac
index f7251f597b44bf6a35accb8747bf0edc241c5fd4..0a59e41b0371db626e51ad4612bdd98cec6ba62c 100644 (file)
--- a/source4/configure.ac
+++ b/source4/configure.ac
@@ -40,7 +40,6 @@ SMB_EXT_LIB_FROM_PKGCONFIG(LIBTALLOC, talloc >= 1.1.0,
        [
                m4_include(lib/talloc/libtalloc.m4)
                SMB_INCLUDE_MK(lib/talloc/config.mk)
-               AC_CONFIG_FILES(lib/talloc/talloc.pc)
        ]
 )
 
@@ -49,7 +48,6 @@ SMB_EXT_LIB_FROM_PKGCONFIG(LIBTDB, tdb >= 1.1.0,
        [
                m4_include(lib/tdb/libtdb.m4)
                SMB_INCLUDE_MK(lib/tdb/config.mk)
-               AC_CONFIG_FILES(lib/tdb/tdb.pc)
        ]
 )
 

diff --git a/source4/lib/talloc/config.mk b/source4/lib/talloc/config.mk
index 540a05d100b29b6e63475dcfcebcdbd1672158fa..af1b590c988ccaf5a93071e8d50384614cd82e26 100644 (file)
--- 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

diff --git a/source4/lib/tdb/config.mk b/source4/lib/tdb/config.mk
index 820c55e363ef524b2e75f6bd0462a31d6abe68fb..89d6af90430b88751611b4cb5db8cc99a3720bb2 100644 (file)
--- a/source4/lib/tdb/config.mk
+++ b/source4/lib/tdb/config.mk
@@ -1,9 +1,7 @@
 ################################################
 # Start SUBSYSTEM LIBTDB
 [LIBRARY::LIBTDB]
-VERSION = 0.0.1
-SO_VERSION = 0
-PC_FILE = tdb.pc
+OUTPUT_TYPE = STATIC_LIBRARY
 OBJ_FILES = \
        common/tdb.o common/dump.o common/io.o common/lock.o \
        common/open.o common/traverse.o common/freelist.o \