git.samba.org
/
abartlet
/
samba.git
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3712ae9
)
r26502: Revert accidently removed pkg-config path change. Thanks to metze for catchin...
author
Jelmer Vernooij
<jelmer@samba.org>
Mon, 17 Dec 2007 10:12:26 +0000
(11:12 +0100)
committer
Stefan Metzmacher
<metze@samba.org>
Fri, 21 Dec 2007 04:51:03 +0000
(
05:51
+0100)
(This used to be commit
b87e71ed4bac64353799bef668bca991b16e763e
)
source4/selftest/selftest.pl
patch
|
blob
|
history
diff --git
a/source4/selftest/selftest.pl
b/source4/selftest/selftest.pl
index 71f23e1af41a26fe92696637d5cdf09c93dfb5ae..456b483f072091bc896a4b397f29467a918f9b24 100755
(executable)
--- a/
source4/selftest/selftest.pl
+++ b/
source4/selftest/selftest.pl
@@
-405,6
+405,11
@@
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{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}";