diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-05-28 21:04:59 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:52:59 -0500 |
| commit | dc919c25343211b25ed8c55577bc5451791cbde4 (patch) | |
| tree | b24c210cd078e9aa7a02c2d649df6dd4f0af1992 /source4/selftest | |
| parent | 5a74acbb177efb5ea1d555383d70174ffe0b2129 (diff) | |
| download | samba-dc919c25343211b25ed8c55577bc5451791cbde4.tar.gz samba-dc919c25343211b25ed8c55577bc5451791cbde4.tar.bz2 samba-dc919c25343211b25ed8c55577bc5451791cbde4.zip | |
r23175: Handle PKG_CONFIG_PATH not set yet - fixes warning in selftest.pl
(This used to be commit 222acbe33b427a6ccae3b9e27b545f22e4564d5c)
Diffstat (limited to 'source4/selftest')
| -rwxr-xr-x | source4/selftest/selftest.pl | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source4/selftest/selftest.pl b/source4/selftest/selftest.pl index 0c9f6acd08..263abae363 100755 --- a/source4/selftest/selftest.pl +++ b/source4/selftest/selftest.pl @@ -519,7 +519,11 @@ if (defined($ENV{LD_LIBRARY_PATH})) { } else { $ENV{LD_LIBRARY_PATH} = "$old_pwd/bin/shared"; } -$ENV{PKG_CONFIG_PATH} = "$old_pwd/bin/pkgconfig:$ENV{PKG_CONFIG_PATH}"; +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"; +} $ENV{PATH} = "$old_pwd/bin:$ENV{PATH}"; |