summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-12-17 11:12:26 +0100
committerStefan Metzmacher <metze@samba.org>2007-12-21 05:51:03 +0100
commite956111917a432d5ea1a7c5cc2fef6c0c3dcbcc1 (patch)
tree7923f9e21d5ee31460505057406a25d6d5d38bee
parent3712ae93f65d8651091ecb85528eed3bde0eb7ec (diff)
downloadsamba-e956111917a432d5ea1a7c5cc2fef6c0c3dcbcc1.tar.gz
samba-e956111917a432d5ea1a7c5cc2fef6c0c3dcbcc1.tar.bz2
samba-e956111917a432d5ea1a7c5cc2fef6c0c3dcbcc1.zip
r26502: Revert accidently removed pkg-config path change. Thanks to metze for catching this.
(This used to be commit b87e71ed4bac64353799bef668bca991b16e763e)
-rwxr-xr-xsource4/selftest/selftest.pl5
1 files changed, 5 insertions, 0 deletions
diff --git a/source4/selftest/selftest.pl b/source4/selftest/selftest.pl
index 71f23e1af4..456b483f07 100755
--- 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}";