The branch, v3-6-test has been updated
via 087d32c s3:build: install libtdb with full version number instead
of only SO version
via 15502f3 s3:build: install libtalloc with full version number
instead of only SO version (cherry picked from commit
4acb8c3f5976c5496aa666a52cd96739836ced2a)
via 8cc2dc4 s3:build: build libtalloc.so.$VERSION with full version
number instead only SO version (cherry picked from commit
d04efc703ba0f195fcef832a30b27a160a787413)
via d1682e2 s3:build: build libtdb.so.$VERSION with full version number
instead only SO version (cherry picked from commit
9c76fdd80c93ec23099987b1559f3a3f0f7b6ca5)
via 43b29fe s3:build: link libtdb as shared lib if using shared libs at
all (cherry picked from commit 3f222513cc99b7ce048bcdaa8cc10f7b91616904)
via 095a83d s3:build: determine full version of libtdb for the samba
build (cherry picked from commit 23637b5789a43fe75bb4eadabd33fb321272b42b)
via a3b0582 s3:build: link libtalloc as shared lib if using shared libs
at all (cherry picked from commit 6c300ec4b51bfd57837d193f0b17b60cb152fc27)
via d579ae8 s3:build: determine full version of libtalloc for the samba
build (cherry picked from commit 472cabbdea3d5def7e7a36b19c5851a0cf0d8d83)
via c01873e s3:build: fix typo in definition of
--enable-external-libtdb (cherry picked from commit
b731b6e032d9ba1469c349d6c46bd7bb52b18c28)
via 2eeb5f2 s3:build: reformat AC_ARG_ENABLE(external_libtalloc...)
(cherry picked from commit abef191fb9fa9edbdb68d7cbbf017e1fa74583f2)
via 6a35fc2 s3:build: print the full version number in the showlibs
targets (cherry picked from commit 7e230b31d19fcd37d5765e9649ccfca39af5541d)
via 2a633d1 s3:build: add LIBWBCLIENT_FULLVER for consistency with
SMB_LIBRARY() (cherry picked from commit
d5d53ba5148d57bae207ded7525a4a38fcb5836f)
via a0b51c3 s3:build: add an optional full version argument to the
SMB_LIBRARY() macro. (cherry picked from commit
adb3fc2f1d85f7621043d087ed2afb0fd053a009)
via 80d05f7 s3:configure: add --enable-smbtorture4 switch (cherry
picked from commit f8e32980f4fab8d6cad5c9f95fab0d1828717cd2)
from f07f3d5 Fix 3.6 headers
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -----------------------------------------------------------------
commit 087d32cf48018572f7c2f0c355db294bf9792f88
Author: Michael Adam <ob...@samba.org>
Date: Fri May 6 17:10:13 2011 +0200
s3:build: install libtdb with full version number instead of only SO version
(cherry picked from commit 5bcc0b2138b60fcecea94093ca43aaca4bc4d4ec)
commit 15502f3206a059a2fe7ced52e0450a57e375bd73
Author: Michael Adam <ob...@samba.org>
Date: Fri May 6 17:10:13 2011 +0200
s3:build: install libtalloc with full version number instead of only SO
version
(cherry picked from commit 4acb8c3f5976c5496aa666a52cd96739836ced2a)
commit 8cc2dc490a27deda5fdae8aaac00c07ea12a58ec
Author: Michael Adam <ob...@samba.org>
Date: Fri May 6 17:00:32 2011 +0200
s3:build: build libtalloc.so.$VERSION with full version number instead only
SO version
(cherry picked from commit d04efc703ba0f195fcef832a30b27a160a787413)
commit d1682e2d62bc320a419bf768c1d76a29666e7f75
Author: Michael Adam <ob...@samba.org>
Date: Fri May 6 17:00:32 2011 +0200
s3:build: build libtdb.so.$VERSION with full version number instead only SO
version
(cherry picked from commit 9c76fdd80c93ec23099987b1559f3a3f0f7b6ca5)
commit 43b29fe6affe3dde1cbf191cc9c46d52f83df3db
Author: Michael Adam <ob...@samba.org>
Date: Fri May 6 16:43:31 2011 +0200
s3:build: link libtdb as shared lib if using shared libs at all
(cherry picked from commit 3f222513cc99b7ce048bcdaa8cc10f7b91616904)
commit 095a83d7fbb23c5df5cadf2d9e5136a7fc396a1f
Author: Michael Adam <ob...@samba.org>
Date: Fri May 6 16:42:53 2011 +0200
s3:build: determine full version of libtdb for the samba build
(cherry picked from commit 23637b5789a43fe75bb4eadabd33fb321272b42b)
commit a3b058206e3c2f7670083f370d7d4540a0a7e29f
Author: Michael Adam <ob...@samba.org>
Date: Fri May 6 16:42:07 2011 +0200
s3:build: link libtalloc as shared lib if using shared libs at all
(cherry picked from commit 6c300ec4b51bfd57837d193f0b17b60cb152fc27)
commit d579ae8a2a3cad5f953a3587024a398add7ccfea
Author: Michael Adam <ob...@samba.org>
Date: Fri May 6 16:40:59 2011 +0200
s3:build: determine full version of libtalloc for the samba build
(cherry picked from commit 472cabbdea3d5def7e7a36b19c5851a0cf0d8d83)
commit c01873ebd9e90572c8e4fab28568328871a12be2
Author: Michael Adam <ob...@samba.org>
Date: Fri May 6 16:39:03 2011 +0200
s3:build: fix typo in definition of --enable-external-libtdb
(cherry picked from commit b731b6e032d9ba1469c349d6c46bd7bb52b18c28)
commit 2eeb5f27a2773972e14a154aac74b8bec136ff50
Author: Michael Adam <ob...@samba.org>
Date: Fri May 6 16:38:38 2011 +0200
s3:build: reformat AC_ARG_ENABLE(external_libtalloc...)
(cherry picked from commit abef191fb9fa9edbdb68d7cbbf017e1fa74583f2)
commit 6a35fc2e50e560d0481b37f509f70d0caa459911
Author: Michael Adam <ob...@samba.org>
Date: Fri May 6 12:57:03 2011 +0200
s3:build: print the full version number in the showlibs targets
(cherry picked from commit 7e230b31d19fcd37d5765e9649ccfca39af5541d)
commit 2a633d1fc0578a943fe689dffea6c3e379820d59
Author: Michael Adam <ob...@samba.org>
Date: Fri May 6 16:37:58 2011 +0200
s3:build: add LIBWBCLIENT_FULLVER for consistency with SMB_LIBRARY()
(cherry picked from commit d5d53ba5148d57bae207ded7525a4a38fcb5836f)
commit a0b51c3ef4a8b606d9464d50cf5ab56952ba508e
Author: Michael Adam <ob...@samba.org>
Date: Fri May 6 12:44:04 2011 +0200
s3:build: add an optional full version argument to the SMB_LIBRARY() macro.
(cherry picked from commit adb3fc2f1d85f7621043d087ed2afb0fd053a009)
commit 80d05f7c3ca9b1d85f6098d74481cea2cf78258d
Author: Michael Adam <ob...@samba.org>
Date: Fri May 6 18:35:06 2011 +0200
s3:configure: add --enable-smbtorture4 switch
(cherry picked from commit f8e32980f4fab8d6cad5c9f95fab0d1828717cd2)
-----------------------------------------------------------------------
Summary of changes:
source3/Makefile.in | 79 ++++++++++++++++++++++++++++++++++++------------
source3/configure.in | 38 +++++++++++++++++------
source3/m4/aclocal.m4 | 10 ++++--
3 files changed, 93 insertions(+), 34 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/Makefile.in b/source3/Makefile.in
index db29a83..aa92d46 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -2024,7 +2024,9 @@ LIBTALLOC_OBJ = $(LIBTALLOC_OBJ0) $(LIBREPLACE_OBJ)
LIBTALLOC_SHARED_TARGET=@LIBTALLOC_SHARED_TARGET@
LIBTALLOC_SOVER=@LIBTALLOC_SOVER@
+LIBTALLOC_FULLVER=@LIBTALLOC_FULLVER@
LIBTALLOC_SHARED_TARGET_SONAME=$(LIBTALLOC_SHARED_TARGET).$(LIBTALLOC_SOVER)
+LIBTALLOC_SHARED_TARGET_FULLVER=$(LIBTALLOC_SHARED_TARGET).$(LIBTALLOC_FULLVER)
LIBTALLOC_STATIC_TARGET=@LIBTALLOC_STATIC_TARGET@
LIBTALLOC_SYMS=$(srcdir)/exports/libtalloc.@SYMSEXT@
LIBTALLOC_HEADERS=$(srcdir)/@tallocdir@/talloc.h
@@ -2036,7 +2038,12 @@ $(LIBTALLOC_SHARED_TARGET_SONAME): $(BINARY_PREREQS)
$(LIBTALLOC_OBJ) $(LIBTALLO
@echo Linking shared library $@
@$(SHLD_DSO) $(LIBTALLOC_OBJ) $(LIBREPLACE_LIBS) @SONAMEFLAG@`basename
$@`
-$(LIBTALLOC_SHARED_TARGET): $(LIBTALLOC_SHARED_TARGET_SONAME)
+$(LIBTALLOC_SHARED_TARGET_FULLVER): $(LIBTALLOC_SHARED_TARGET_SONAME)
+ @rm -f $@
+ @mv -f $(LIBTALLOC_SHARED_TARGET_SONAME) $@
+ @ln -f -s `basename $@` $(LIBTALLOC_SHARED_TARGET_SONAME)
+
+$(LIBTALLOC_SHARED_TARGET): $(LIBTALLOC_SHARED_TARGET_FULLVER)
@rm -f $@
@ln -f -s `basename $(LIBTALLOC_SHARED_TARGET_SONAME)` $@
@@ -2054,8 +2061,13 @@ cleanlibtalloc::
installlibtalloc:: installdirs libtalloc
@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN)
$(DESTDIR) $(LIBDIR)
- -$(INSTALLLIBCMD_SH) $(LIBTALLOC_SHARED_TARGET_SONAME)
$(DESTDIR)$(LIBDIR)
+ -$(INSTALLLIBCMD_SH) $(LIBTALLOC_SHARED_TARGET_FULLVER)
$(DESTDIR)$(LIBDIR)
@rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBTALLOC_SHARED_TARGET)`
+ @rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBTALLOC_SHARED_TARGET_SONAME)`
+ -if test -r $(LIBTALLOC_SHARED_TARGET_FULLVER) ; then \
+ ln -f -s `basename $(LIBTALLOC_SHARED_TARGET_FULLVER)` \
+ $(DESTDIR)$(LIBDIR)/`basename
$(LIBTALLOC_SHARED_TARGET_SONAME)` ; \
+ fi
-if test -r $(LIBTALLOC_SHARED_TARGET_SONAME) ; then \
ln -f -s `basename $(LIBTALLOC_SHARED_TARGET_SONAME)` \
$(DESTDIR)$(LIBDIR)/`basename
$(LIBTALLOC_SHARED_TARGET)` ; \
@@ -2078,15 +2090,17 @@ shlibs test_shlibs: @LIBTALLOC_SHARED@
showlibtalloc:
@echo ""
- @echo "LIBTALLOC_SHARED = @LIBTALLOC_SHARED@"
- @echo "LIBTALLOC_STATIC = @LIBTALLOC_STATIC@"
- @echo "LIBTALLOC_LIBS = $(LIBTALLOC_LIBS)"
+ @echo "LIBTALLOC_SHARED = @LIBTALLOC_SHARED@"
+ @echo "LIBTALLOC_STATIC = @LIBTALLOC_STATIC@"
+ @echo "LIBTALLOC_LIBS = $(LIBTALLOC_LIBS)"
@echo ""
- @echo "LIBTALLOC_SHARED_TARGET = $(LIBTALLOC_SHARED_TARGET)"
- @echo "LIBTALLOC_SOVER = $(LIBTALLOC_SOVER)"
- @echo "LIBTALLOC_SHARED TARGET_SONAME =
$(LIBTALLOC_SHARED_TARGET_SONAME)"
- @echo "LIBTALLOC_STATIC_TARGET = $(LIBTALLOC_STATIC_TARGET)"
- @echo "LIBTALLOC = $(LIBTALLOC)"
+ @echo "LIBTALLOC_SHARED_TARGET = $(LIBTALLOC_SHARED_TARGET)"
+ @echo "LIBTALLOC_SOVER = $(LIBTALLOC_SOVER)"
+ @echo "LIBTALLOC_FULLVER = $(LIBTALLOC_FULLVER)"
+ @echo "LIBTALLOC_SHARED TARGET_SONAME =
$(LIBTALLOC_SHARED_TARGET_SONAME)"
+ @echo "LIBTALLOC_SHARED TARGET_FULLVER =
$(LIBTALLOC_SHARED_TARGET_FULLVER)"
+ @echo "LIBTALLOC_STATIC_TARGET = $(LIBTALLOC_STATIC_TARGET)"
+ @echo "LIBTALLOC = $(LIBTALLOC)"
showlibs:: showlibtalloc
@@ -2101,7 +2115,9 @@ LIBTDB_OBJ = $(LIBTDB_OBJ0) $(LIBREPLACE_OBJ)
LIBTDB_SHARED_TARGET=@LIBTDB_SHARED_TARGET@
LIBTDB_SOVER=@LIBTDB_SOVER@
+LIBTDB_FULLVER=@LIBTDB_FULLVER@
LIBTDB_SHARED_TARGET_SONAME=$(LIBTDB_SHARED_TARGET).$(LIBTDB_SOVER)
+LIBTDB_SHARED_TARGET_FULLVER=$(LIBTDB_SHARED_TARGET).$(LIBTDB_FULLVER)
LIBTDB_STATIC_TARGET=@LIBTDB_STATIC_TARGET@
LIBTDB_SYMS=$(srcdir)/exports/libtdb.@SYMSEXT@
LIBTDB_HEADERS=$(srcdir)/@tdbdir@/include/tdb.h
@@ -2109,12 +2125,18 @@ LIBTDB_HEADERS=$(srcdir)/@tdbdir@/include/tdb.h
$(LIBTDB_SYMS): $(LIBTDB_HEADERS)
@$(MKSYMS_SH) $(AWK) $@ $(LIBTDB_HEADERS)
+
$(LIBTDB_SHARED_TARGET_SONAME): $(BINARY_PREREQS) $(LIBTDB_OBJ) $(LIBTDB_SYMS)
@echo Linking shared library $@
@$(SHLD_DSO) $(LIBTDB_OBJ) $(LIBREPLACE_LIBS) $(TDB_DEPS) \
@SONAMEFLAG@`basename $@`
-$(LIBTDB_SHARED_TARGET): $(LIBTDB_SHARED_TARGET_SONAME)
+$(LIBTDB_SHARED_TARGET_FULLVER): $(LIBTDB_SHARED_TARGET_SONAME)
+ @rm -f $@
+ @mv -f $(LIBTDB_SHARED_TARGET_SONAME) $(LIBTDB_SHARED_TARGET_FULLVER)
+ @ln -f -s `basename $(LIBTDB_SHARED_TARGET_FULLVER)`
$(LIBTDB_SHARED_TARGET_SONAME)
+
+$(LIBTDB_SHARED_TARGET): $(LIBTDB_SHARED_TARGET_FULLVER)
@rm -f $@
@ln -f -s `basename $(LIBTDB_SHARED_TARGET_SONAME)` $@
@@ -2134,8 +2156,13 @@ cleanlibtdb::
installlibtdb:: installdirs libtdb
@$(SHELL) $(srcdir)/script/installdirs.sh $(INSTALLPERMS_BIN)
$(DESTDIR) $(LIBDIR)
- -$(INSTALLLIBCMD_SH) $(LIBTDB_SHARED_TARGET_SONAME) $(DESTDIR)$(LIBDIR)
+ -$(INSTALLLIBCMD_SH) $(LIBTDB_SHARED_TARGET_FULLVER) $(DESTDIR)$(LIBDIR)
@rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBTDB_SHARED_TARGET)`
+ @rm -f $(DESTDIR)$(LIBDIR)/`basename $(LIBTDB_SHARED_TARGET_SONAME)`
+ -if test -r $(LIBTDB_SHARED_TARGET_FULLVER) ; then \
+ ln -f -s `basename $(LIBTDB_SHARED_TARGET_FULLVER)` \
+ $(DESTDIR)$(LIBDIR)/`basename
$(LIBTDB_SHARED_TARGET_SONAME)` ; \
+ fi
-if test -r $(LIBTDB_SHARED_TARGET_SONAME) ; then \
ln -f -s `basename $(LIBTDB_SHARED_TARGET_SONAME)` \
$(DESTDIR)$(LIBDIR)/`basename $(LIBTDB_SHARED_TARGET)`
; \
@@ -2158,15 +2185,17 @@ shlibs test_shlibs: @LIBTDB_SHARED@
showlibtdb:
@echo ""
- @echo "LIBTDB_SHARED = @LIBTDB_SHARED@"
- @echo "LIBTDB_STATIC = @LIBTDB_STATIC@"
- @echo "LIBTDB_LIBS = $(LIBTDB_LIBS)"
+ @echo "LIBTDB_SHARED = @LIBTDB_SHARED@"
+ @echo "LIBTDB_STATIC = @LIBTDB_STATIC@"
+ @echo "LIBTDB_LIBS = $(LIBTDB_LIBS)"
@echo ""
- @echo "LIBTDB_SHARED_TARGET = $(LIBTDB_SHARED_TARGET)"
- @echo "LIBTDB_SOVER = $(LIBTDB_SOVER)"
- @echo "LIBTDB_SHARED TARGET_SONAME = $(LIBTDB_SHARED_TARGET_SONAME)"
- @echo "LIBTDB_STATIC_TARGET = $(LIBTDB_STATIC_TARGET)"
- @echo "LIBTDB = $(LIBTDB)"
+ @echo "LIBTDB_SHARED_TARGET = $(LIBTDB_SHARED_TARGET)"
+ @echo "LIBTDB_SOVER = $(LIBTDB_SOVER)"
+ @echo "LIBTDB_FULLVER = $(LIBTDB_FULLVER)"
+ @echo "LIBTDB_SHARED TARGET_SONAME = $(LIBTDB_SHARED_TARGET_SONAME)"
+ @echo "LIBTDB_SHARED TARGET_FULLVER = $(LIBTDB_SHARED_TARGET_FULLVER)"
+ @echo "LIBTDB_STATIC_TARGET = $(LIBTDB_STATIC_TARGET)"
+ @echo "LIBTDB = $(LIBTDB)"
showlibs:: showlibtdb
@@ -2192,6 +2221,7 @@ LIBWBCLIENT_OBJ = $(LIBWBCLIENT_OBJ0) \
LIBWBCLIENT_SHARED_TARGET=@LIBWBCLIENT_SHARED_TARGET@
LIBWBCLIENT_SOVER=@LIBWBCLIENT_SOVER@
+LIBWBCLIENT_FULLVER=@LIBWBCLIENT_FULLVER@
LIBWBCLIENT_SHARED_TARGET_SONAME=$(LIBWBCLIENT_SHARED_TARGET).$(LIBWBCLIENT_SOVER)
LIBWBCLIENT_STATIC_TARGET=@LIBWBCLIENT_STATIC_TARGET@
LIBWBCLIENT_SYMS=$(srcdir)/exports/libwbclient.@SYMSEXT@
@@ -2254,6 +2284,7 @@ showlibwbclient:
@echo ""
@echo "LIBWBCLIENT_SHARED_TARGET = $(LIBWBCLIENT_SHARED_TARGET)"
@echo "LIBWBCLIENT_SOVER = $(LIBWBCLIENT_SOVER)"
+ @echo "LIBWBCLIENT_FULLVER = $(LIBWBCLIENT_FULLVER)"
@echo "LIBWBCLIENT_SHARED TARGET_SONAME =
$(LIBWBCLIENT_SHARED_TARGET_SONAME)"
@echo "LIBWBCLIENT_STATIC_TARGET = $(LIBWBCLIENT_STATIC_TARGET)"
@echo "LIBWBCLIENT = $(LIBWBCLIENT)"
@@ -2270,6 +2301,7 @@ showlibs:: showlibwbclient
LIBADDNS_SHARED_TARGET=@LIBADDNS_SHARED_TARGET@
LIBADDNS_SOVER=@LIBADDNS_SOVER@
+LIBADDNS_FULLVER=@LIBADDNS_FULLVER@
LIBADDNS_SHARED_TARGET_SONAME=$(LIBADDNS_SHARED_TARGET).$(LIBADDNS_SOVER)
LIBADDNS_STATIC_TARGET=@LIBADDNS_STATIC_TARGET@
LIBADDNS=@LIBADDNS_STATIC@ @LIBADDNS_SHARED@
@@ -2327,6 +2359,7 @@ showlibaddns:
@echo ""
@echo "LIBADDNS_SHARED_TARGET = $(LIBADDNS_SHARED_TARGET)"
@echo "LIBADDNS_SOVER = $(LIBADDNS_SOVER)"
+ @echo "LIBADDNS_FULLVER = $(LIBADDNS_FULLVER)"
@echo "LIBADDNS_SHARED TARGET_SONAME = $(LIBADDNS_SHARED_TARGET_SONAME)"
@echo "LIBADDNS_STATIC_TARGET = $(LIBADDNS_STATIC_TARGET)"
@echo "LIBADDNS = $(LIBADDNS)"
@@ -2377,6 +2410,7 @@ LIBNETAPI_OBJ = $(LIBNETAPI_OBJ0) $(LIBNET_OBJ) \
LIBNETAPI_SHARED_TARGET=@LIBNETAPI_SHARED_TARGET@
LIBNETAPI_SOVER=@LIBNETAPI_SOVER@
+LIBNETAPI_FULLVER=@LIBNETAPI_FULLVER@
LIBNETAPI_SHARED_TARGET_SONAME=$(LIBNETAPI_SHARED_TARGET).$(LIBNETAPI_SOVER)
LIBNETAPI_STATIC_TARGET=@LIBNETAPI_STATIC_TARGET@
LIBNETAPI_SYMS=$(srcdir)/exports/libnetapi.@SYMSEXT@
@@ -2441,6 +2475,7 @@ showlibnetapi:
@echo ""
@echo "LIBNETAPI_SHARED_TARGET = $(LIBNETAPI_SHARED_TARGET)"
@echo "LIBNETAPI_SOVER = $(LIBNETAPI_SOVER)"
+ @echo "LIBNETAPI_FULLVER = $(LIBNETAPI_FULLVER)"
@echo "LIBNETAPI_SHARED TARGET_SONAME =
$(LIBNETAPI_SHARED_TARGET_SONAME)"
@echo "LIBNETAPI_STATIC_TARGET = $(LIBNETAPI_STATIC_TARGET)"
@echo "LIBNETAPI = $(LIBNETAPI)"
@@ -2455,6 +2490,7 @@ showlibs:: showlibnetapi
LIBSMBCLIENT_SHARED_TARGET=@LIBSMBCLIENT_SHARED_TARGET@
LIBSMBCLIENT_SOVER=@LIBSMBCLIENT_SOVER@
+LIBSMBCLIENT_FULLVER=@LIBSMBCLIENT_FULLVER@
LIBSMBCLIENT_SHARED_TARGET_SONAME=$(LIBSMBCLIENT_SHARED_TARGET).$(LIBSMBCLIENT_SOVER)
LIBSMBCLIENT_STATIC_TARGET=@LIBSMBCLIENT_STATIC_TARGET@
LIBSMBCLIENT=@LIBSMBCLIENT_STATIC@ @LIBSMBCLIENT_SHARED@
@@ -2523,6 +2559,7 @@ showlibsmbclient:
@echo ""
@echo "LIBSMBCLIENT_SHARED_TARGET =
$(LIBSMBCLIENT_SHARED_TARGET)"
@echo "LIBSMBCLIENT_SOVER = $(LIBSMBCLIENT_SOVER)"
+ @echo "LIBSMBCLIENT_FULLVER = $(LIBSMBCLIENT_FULLVER)"
@echo "LIBSMBCLIENT_SHARED TARGET_SONAME =
$(LIBSMBCLIENT_SHARED_TARGET_SONAME)"
@echo "LIBSMBCLIENT_STATIC_TARGET =
$(LIBSMBCLIENT_STATIC_TARGET)"
@echo "LIBSMBCLIENT = $(LIBSMBCLIENT)"
@@ -2541,6 +2578,7 @@ LIBSMBSHAREMODES_OBJ = $(LIBSMBSHAREMODES_OBJ0)
LIBSMBSHAREMODES_SHARED_TARGET=@LIBSMBSHAREMODES_SHARED_TARGET@
LIBSMBSHAREMODES_SOVER=@LIBSMBSHAREMODES_SOVER@
+LIBSMBSHAREMODES_FULLVER=@LIBSMBSHAREMODES_FULLVER@
LIBSMBSHAREMODES_SHARED_TARGET_SONAME=$(LIBSMBSHAREMODES_SHARED_TARGET).$(LIBSMBSHAREMODES_SOVER)
LIBSMBSHAREMODES_STATIC_TARGET=@LIBSMBSHAREMODES_STATIC_TARGET@
LIBSMBSHAREMODES=@LIBSMBSHAREMODES_STATIC@ @LIBSMBSHAREMODES_SHARED@
@@ -2605,6 +2643,7 @@ showlibsmbsharemodes:
@echo ""
@echo "LIBSMBSHAREMODES_SHARED_TARGET =
$(LIBSMBSHAREMODES_SHARED_TARGET)"
@echo "LIBSMBSHAREMODES_SOVER =
$(LIBSMBSHAREMODES_SOVER)"
+ @echo "LIBSMBSHAREMODES_FULLVER =
$(LIBSMBSHAREMODES_FULLVER)"
@echo "LIBSMBSHAREMODES_SHARED TARGET_SONAME =
$(LIBSMBSHAREMODES_SHARED_TARGET_SONAME)"
@echo "LIBSMBSHAREMODES_STATIC_TARGET =
$(LIBSMBSHAREMODES_STATIC_TARGET)"
@echo "LIBSMBSHAREMODES = $(LIBSMBSHAREMODES)"
diff --git a/source3/configure.in b/source3/configure.in
index 72568d8..248f319 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -73,6 +73,7 @@ AC_SUBST(LIBWBCLIENT_SHARED)
AC_SUBST(LIBWBCLIENT_STATIC_TARGET)
AC_SUBST(LIBWBCLIENT_STATIC)
AC_SUBST(LIBWBCLIENT_SOVER)
+AC_SUBST(LIBWBCLIENT_FULLVER)
AC_SUBST(LIBWBCLIENT)
AC_SUBST(LIBWBCLIENT_LIBS)
@@ -196,7 +197,14 @@ AC_ARG_WITH(profiling-data,
)
dnl Checks for programs.
-smbtorture4_possible=yes
+AC_ARG_ENABLE(smbtorture4,
+ [AS_HELP_STRING([--enable-smbtorture4], [Enable building smbtorture4
(default=auto)])])
+
+if test x$enable_smbtorture4 != xno; then
+ smbtorture4_possible=yes
+else
+ smbtorture4_possible=no
+fi
AC_PROG_INSTALL
AC_PROG_AWK
@@ -2072,8 +2080,11 @@ LINK_LIBSMBCLIENT=STATIC
# TODO: for talloc and tdb (at least), these should
# be extracted from their respective source directories
#
-AC_ARG_ENABLE(external_libtalloc,
[AS_HELP_STRING([--enable-external-libtalloc], [Enable external talloc
[default=auto]])],
-[ enable_external_libtalloc=$enableval ], [ enable_external_libtalloc=auto ])
+AC_ARG_ENABLE(external_libtalloc,
+ [AS_HELP_STRING([--enable-external-libtalloc],
+ [Enable external talloc [default=auto]])],
+ [ enable_external_libtalloc=$enableval ],
+ [ enable_external_libtalloc=auto ])
if test "x$enable_external_libtalloc" != xno
then
@@ -2090,8 +2101,11 @@ fi
if test "x$enable_external_libtalloc" = xno
then
m4_include(../lib/talloc/libtalloc.m4)
- LINK_LIBTALLOC=STATIC
- SMB_LIBRARY(talloc, 2)
+ if test x"$USESHARED" == x"no" ; then
+ LINK_LIBTALLOC=STATIC
+ fi
+ LIBTALLOCVERSION=`grep ^VERSION ${tallocdir}/wscript | sed -e "s/'//g"
-e 's/.* //'`
+ SMB_LIBRARY(talloc, 2, ${LIBTALLOCVERSION})
LIBTALLOC_OBJ0=""
for obj in ${TALLOC_OBJ}; do
LIBTALLOC_OBJ0="${LIBTALLOC_OBJ0} ${tallocdir}/${obj}"
@@ -2108,8 +2122,8 @@ fi
AC_ARG_ENABLE(external_libtdb,
[AS_HELP_STRING([--enable-external-libtdb],
[Enable external tdb [default=auto]])],
- [ enable_external_libtalloc=$enableval ],
- [ enable_external_libtalloc=auto ])
+ [ enable_external_libtdb=$enableval ],
+ [ enable_external_libtdb=auto ])
if test "x$enable_external_libtdb" != xno
then
@@ -2128,8 +2142,11 @@ AC_SUBST(LIBTDB_OBJ0)
if test "x$enable_external_libtdb" = xno
then
m4_include(../lib/tdb/libtdb.m4)
- LINK_LIBTDB=STATIC
- SMB_LIBRARY(tdb, 1)
+ if test x"$USESHARED" == x"no" ; then
+ LINK_LIBTDB=STATIC
+ fi
+ LIBTDBVERSION=`grep ^VERSION ${tdbdir}/wscript | sed -e "s/'//g" -e
's/.* //'`
+ SMB_LIBRARY(tdb, 1, ${LIBTDBVERSION})
LIBTDB_OBJ0=""
LIBTDB_LIBS="$LIBTDB_LIBS $TDB_DEPS"
for obj in ${TDB_OBJ}; do
@@ -2164,7 +2181,7 @@ fi
SMB_LIBRARY(netapi, 0)
SMB_LIBRARY(smbclient, 0)
SMB_LIBRARY(smbsharemodes, 0)
-SMB_LIBRARY(addns, 0, no, [undefined API])
+SMB_LIBRARY(addns, 0, [], no, [undefined API])
@@ -6364,6 +6381,7 @@ else
LIBWBCLIENT_SHARED_TARGET=bin/libwbclient.$SHLIBEXT
LIBWBCLIENT_STATIC_TARGET=bin/libwbclient.a
LIBWBCLIENT_SOVER=0
+ LIBWBCLIENT_FULLVER=0
if test $BLDSHARED = true -a x"$HAVE_WINBIND" = x"yes" -a
x"$BUILD_LIBWBCLIENT_SHARED" = x"yes"; then
NSS_MODULES="${WINBIND_NSS} ${WINBIND_WINS_NSS}"
## Only worry about libwbclient if we have shared
diff --git a/source3/m4/aclocal.m4 b/source3/m4/aclocal.m4
index 301445f..afd7c74 100644
--- a/source3/m4/aclocal.m4
+++ b/source3/m4/aclocal.m4
@@ -54,7 +54,7 @@ AC_DEFUN(SMB_SUBSYSTEM,
])
-dnl SMB_LIBRARY(name, version, default, reason)
+dnl SMB_LIBRARY(name, soversion, fullversion, default, reason)
dnl
dnl configure build and use of an (internal) shared library
dnl
@@ -74,6 +74,7 @@ LIBUC[_TARGET]=
[UNINSTALL_]LIBUC=
m4_if([$2], [], [LIBUC[_SOVER]=0], [LIBUC[_SOVER]=$2])
+m4_if([$3], [], [LIBUC[_FULLVER]=$LIBUC[_SOVER]], [LIBUC[_FULLVER]=$3])
AC_SUBST(LIBUC[_SHARED_TARGET])
AC_SUBST(LIBUC[_STATIC_TARGET])
@@ -84,15 +85,16 @@ AC_SUBST(LIBUC[_TARGET])
AC_SUBST([INSTALL_]LIBUC)
AC_SUBST([UNINSTALL_]LIBUC)
AC_SUBST(LIBUC[_SOVER])
+AC_SUBST(LIBUC[_FULLVER])
AC_MSG_CHECKING([whether to build the LIBNAME shared library])
-m4_if([$3], [no], [
+m4_if([$4], [no], [
dnl set the default to not build the shared lib
AC_ARG_WITH(LIBNAME,
AS_HELP_STRING([--with-]LIBNAME,
- m4_if([$4], [],
+ m4_if([$5], [],
[Build the LIBNAME shared library (default=no)],
- [Build the LIBNAME shared library (default=no ($4))])),
+ [Build the LIBNAME shared library (default=no ($5))])),
[
case "$withval" in
yes)
--
Samba Shared Repository
