diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-17 05:44:38 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:50:44 +0100 |
| commit | b1cd9c39c3465dff1e94241779c643a28d008ce8 (patch) | |
| tree | 653f90a1bbf7baaae9539f361e187c6eb40327ed | |
| parent | 9fcafcae06a2bf98fc5400c9bdb7cbb7c8f89dc3 (diff) | |
| download | samba-b1cd9c39c3465dff1e94241779c643a28d008ce8.tar.gz samba-b1cd9c39c3465dff1e94241779c643a28d008ce8.tar.bz2 samba-b1cd9c39c3465dff1e94241779c643a28d008ce8.zip | |
r26486: Use portable run-time library path environment variable.
(This used to be commit 78c183b88661df90def42d6a3852dd6e36a5fd0b)
| -rw-r--r-- | source4/build/smb_build/makefile.pm | 2 | ||||
| -rw-r--r-- | source4/selftest/config.mk | 2 | ||||
| -rwxr-xr-x | source4/selftest/selftest.pl | 10 |
3 files changed, 3 insertions, 11 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm index 804a728457..d9b5ac4d78 100644 --- a/source4/build/smb_build/makefile.pm +++ b/source4/build/smb_build/makefile.pm @@ -217,6 +217,8 @@ HOSTLD_FLAGS=$self->{config}->{LDFLAGS} XSLTPROC=$self->{config}->{XSLTPROC} +LIB_PATH_VAR=$self->{config}->{LIB_PATH_VAR} + LEX=$self->{config}->{LEX} YACC=$self->{config}->{YACC} YAPP=$self->{config}->{YAPP} diff --git a/source4/selftest/config.mk b/source4/selftest/config.mk index 52148090ad..72bc10cf56 100644 --- a/source4/selftest/config.mk +++ b/source4/selftest/config.mk @@ -1,4 +1,4 @@ -SELFTEST = $(PERL) $(srcdir)/selftest/selftest.pl --prefix=${selftest_prefix} \ +SELFTEST = $(LIB_PATH_VAR)=$(builddir)/bin/shared $(PERL) $(srcdir)/selftest/selftest.pl --prefix=${selftest_prefix} \ --builddir=$(builddir) --srcdir=$(srcdir) \ --expected-failures=$(srcdir)/samba4-knownfail \ --exclude=$(srcdir)/samba4-skip --testlist="./selftest/samba4_tests.sh|" \ diff --git a/source4/selftest/selftest.pl b/source4/selftest/selftest.pl index a1aca161a8..71f23e1af4 100755 --- a/source4/selftest/selftest.pl +++ b/source4/selftest/selftest.pl @@ -405,16 +405,6 @@ my $tls_enabled = not $opt_quick; $ENV{TLS_ENABLED} = ($tls_enabled?"yes":"no"); $ENV{LDB_MODULES_PATH} = "$old_pwd/bin/modules/ldb"; $ENV{LD_SAMBA_MODULE_PATH} = "$old_pwd/bin/modules"; -if (defined($ENV{LD_LIBRARY_PATH})) { - $ENV{LD_LIBRARY_PATH} = "$old_pwd/bin/shared:$ENV{LD_LIBRARY_PATH}"; -} else { - $ENV{LD_LIBRARY_PATH} = "$old_pwd/bin/shared"; -} -if (defined($ENV{PKG_CONFIG_PATH})) { - $ENV{PKG_CONFIG_PATH} = "$old_pwd/bin/pkgconfig:$ENV{PKG_CONFIG_PATH}"; -} else { - $ENV{PKG_CONFIG_PATH} = "$old_pwd/bin/pkgconfig"; -} # Required for smbscript: $ENV{PATH} = "$old_pwd/bin:$old_pwd:$ENV{PATH}"; |