The branch, master has been updated via 943387edc12a276d358add404e4fecd6c3aec303 (commit) via ec0eab7f0b20e6f1691ce3a723e29dbf7ee3fd99 (commit) from eba7f1032d79fe5dcbc1902e3af1087399f67a5a (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit 943387edc12a276d358add404e4fecd6c3aec303 Author: Stefan Metzmacher <[EMAIL PROTECTED]> Date: Wed Sep 24 22:49:05 2008 +0200 build: fix the libcryptosrcdir for the merged build metze commit ec0eab7f0b20e6f1691ce3a723e29dbf7ee3fd99 Author: Stefan Metzmacher <[EMAIL PROTECTED]> Date: Tue Sep 23 10:34:06 2008 +0200 s3:configure: add -L./bin also for the merged build metze ----------------------------------------------------------------------- Summary of changes: source3/configure.in | 4 ++++ source3/samba4.mk | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/configure.in b/source3/configure.in index f23f6b5..63e17dc 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -6276,6 +6276,10 @@ CFLAGS="${CFLAGS} \$(FLAGS)" if test x$MERGED_BUILD != x1; then CFLAGS="${CFLAGS} -D_SAMBA_BUILD_=3" +else + if test x"$BLDSHARED" = x"true" ; then + LDFLAGS="$LDFLAGS -L./bin" + fi fi AC_OUTPUT(Makefile diff --git a/source3/samba4.mk b/source3/samba4.mk index 53ea76e..3abcbe1 100644 --- a/source3/samba4.mk +++ b/source3/samba4.mk @@ -87,7 +87,7 @@ libstreamsrcdir := $(samba4srcdir)/lib/stream libutilsrcdir := $(samba4srcdir)/lib/util libtdrsrcdir := $(samba4srcdir)/lib/tdr libdbwrapsrcdir := $(samba4srcdir)/lib/dbwrap -libcryptosrcdir := $(samba4srcdir)/lib/crypto +libcryptosrcdir := $(samba4srcdir)/../lib/crypto libtorturesrcdir := $(samba4srcdir)/lib/torture libcompressionsrcdir := $(samba4srcdir)/../lib/compression libgencachesrcdir := $(samba4srcdir)/lib -- Samba Shared Repository