svn commit: samba r26502 - in branches/SAMBA_4_0: . source/selftest

jelmer at samba.org jelmer at samba.org
Mon Dec 17 11:12:27 GMT 2007


Author: jelmer
Date: 2007-12-17 11:12:26 +0000 (Mon, 17 Dec 2007)
New Revision: 26502

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

Log:
Revert accidently removed pkg-config path change. Thanks to metze for catching this.
Modified:
   branches/SAMBA_4_0/
   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/selftest/selftest.pl
===================================================================
--- branches/SAMBA_4_0/source/selftest/selftest.pl	2007-12-17 10:26:56 UTC (rev 26501)
+++ branches/SAMBA_4_0/source/selftest/selftest.pl	2007-12-17 11:12:26 UTC (rev 26502)
@@ -405,6 +405,11 @@
 $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{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}";
 



More information about the samba-cvs mailing list