diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-13 17:01:37 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-13 17:01:37 +0100 |
| commit | 11bc6056ea2eec9eb9a206fa5ae2a2b6b3efe21a (patch) | |
| tree | 6925aec36eeb7fd8efdd8a7d211145960bbd7706 /source4 | |
| parent | 6f4a7035d227e8b88effaef45e38954e9129376e (diff) | |
| download | samba-11bc6056ea2eec9eb9a206fa5ae2a2b6b3efe21a.tar.gz samba-11bc6056ea2eec9eb9a206fa5ae2a2b6b3efe21a.tar.bz2 samba-11bc6056ea2eec9eb9a206fa5ae2a2b6b3efe21a.zip | |
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)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/configure.ac | 2 | ||||
| -rw-r--r-- | source4/lib/talloc/config.mk | 4 | ||||
| -rw-r--r-- | source4/lib/tdb/config.mk | 4 |
3 files changed, 2 insertions, 8 deletions
diff --git a/source4/configure.ac b/source4/configure.ac index f7251f597b..0a59e41b03 100644 --- 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 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 diff --git a/source4/lib/tdb/config.mk b/source4/lib/tdb/config.mk index 820c55e363..89d6af9043 100644 --- 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 \ |