svn commit: samba r26486 - in branches/SAMBA_4_0: . source/build/smb_build source/selftest

[jelmer at samba.org]

Author: jelmer
Date: 2007-12-17 05:44:38 +0000 (Mon, 17 Dec 2007)
New Revision: 26486

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=26486

Log:
Use portable run-time library path environment variable.
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/build/smb_build/makefile.pm
   branches/SAMBA_4_0/source/selftest/config.mk
   branches/SAMBA_4_0/source/selftest/selftest.pl


Changeset:

Property changes on: branches/SAMBA_4_0
___________________________________________________________________
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...

Modified: branches/SAMBA_4_0/source/build/smb_build/makefile.pm
===================================================================
--- branches/SAMBA_4_0/source/build/smb_build/makefile.pm	2007-12-17 05:19:48 UTC (rev 26485)
+++ branches/SAMBA_4_0/source/build/smb_build/makefile.pm	2007-12-17 05:44:38 UTC (rev 26486)
@@ -217,6 +217,8 @@
 
 XSLTPROC=$self->{config}->{XSLTPROC}
 
+LIB_PATH_VAR=$self->{config}->{LIB_PATH_VAR}
+
 LEX=$self->{config}->{LEX}
 YACC=$self->{config}->{YACC}
 YAPP=$self->{config}->{YAPP}

Modified: branches/SAMBA_4_0/source/selftest/config.mk
===================================================================
--- branches/SAMBA_4_0/source/selftest/config.mk	2007-12-17 05:19:48 UTC (rev 26485)
+++ branches/SAMBA_4_0/source/selftest/config.mk	2007-12-17 05:44:38 UTC (rev 26486)
@@ -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|" \

Modified: branches/SAMBA_4_0/source/selftest/selftest.pl
===================================================================
--- branches/SAMBA_4_0/source/selftest/selftest.pl	2007-12-17 05:19:48 UTC (rev 26485)
+++ branches/SAMBA_4_0/source/selftest/selftest.pl	2007-12-17 05:44:38 UTC (rev 26486)
@@ -405,16 +405,6 @@
 $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}";