s3/s4:build: honor library path from environment

we may not throw away LD_LIBRARY_PATH and friends as they sometimes contain
important information. Some of the build farm machines for example have the
python lib path in there - we can't run make test when we suddenly forget how
to use python

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 01ab5f0a5816fe92622eb16c409974261ef2ba62..dd133df3b85db9aae6f086f748a6e9590ecfa54c 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -3203,7 +3203,7 @@ valgrindtest:: all torture timelimit
 SELFTEST_FORMAT = plain
 selftestdir = ../selftest
 
-S3_LD_LIBPATH_OVERRIDE = $(LIB_PATH_VAR)="$(builddir)/bin"
+S3_LD_LIBPATH_OVERRIDE = $(LIB_PATH_VAR)="$(builddir)/bin:$$$(LIB_PATH_VAR)"
 
 selftest:: all torture timelimit
        @LIB_PATH_VAR=$(LIB_PATH_VAR) $(S3_LD_LIBPATH_OVERRIDE) \

diff --git a/source3/samba4.mk b/source3/samba4.mk
index e63a8453c0e7fbab0be0dfb4a1e171a0adc36519..653ae254640db7075524a2752e72948f00a5ebae 100644 (file)
--- a/source3/samba4.mk
+++ b/source3/samba4.mk
@@ -172,7 +172,7 @@ everything:: $(patsubst %,%4,$(BINARIES))
 setup:
        @ln -sf ../source4/setup setup
 
-S4_LD_LIBPATH_OVERRIDE = $(LIB_PATH_VAR)="$(builddir)/bin/shared"
+S4_LD_LIBPATH_OVERRIDE = $(LIB_PATH_VAR)="$(builddir)/bin/shared:$$$(LIB_PATH_VAR)"
 
 SELFTEST4 = $(S4_LD_LIBPATH_OVERRIDE) EXEEXT="4" PYTHON="$(PYTHON)" PERL="$(PERL)" \
     $(PERL) $(selftestdir)/selftest.pl --prefix=st4 \

diff --git a/source4/Makefile b/source4/Makefile
index d6ce5170ca6f1fd1fd1ee06304707e8ee6de08ae..d6ae88706665f3ec8483367b4f4b9b382d5d41b7 100644 (file)
--- a/source4/Makefile
+++ b/source4/Makefile
@@ -163,7 +163,7 @@ manpages:: $(MANPAGES)
 all:: showflags $(ALL_PREDEP) binaries modules pythonmods libraries headers
 everything:: all
 
-LD_LIBPATH_OVERRIDE = $(LIB_PATH_VAR)=$(shliboutputdir)
+LD_LIBPATH_OVERRIDE = $(LIB_PATH_VAR)=$(shliboutputdir):$$$(LIB_PATH_VAR)
 
 # 'make testsuite' creates all binaries which are
 # needed by samba3's 'make test' and the build-farm