diff options
| author | Tomi Ollila <tomi.ollila@iki.fi> | 2019-11-17 23:24:41 +0200 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2019-12-09 16:24:37 -0400 |
| commit | eb1f799892a483f4e933867b2b9bafabd405045e (patch) | |
| tree | 826c60a481c1026fc96a3634b57f6ce9d2286ec2 /configure | |
| parent | e712b91f46c076b5661835033d1d3db4293f8eb2 (diff) | |
configure: fix reference to possibly undefined $PKG_CONFIG_PATH
In case zlib not found by pkg-config(1) the pkg-config information
is resolved by attempting to print ZLIB_VERSION from from zlib
installation if it exists anyway.
If above done successfully compat/zlib.pc is written for forthcoming
pkg-config execution.
Since `set -u` is in effect (since 124a67e96, 2016-05-06),
expanding unset $PKG_CONFIG_PATH (would have) failed whenever tried.
Now it is changed to set as "$PKG_CONFIG_PATH:compat" if PKG_CONFIG_PATH
is set and is non-empty string, plain "compat" otherwise.
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -604,7 +604,7 @@ fi if ! pkg-config --exists zlib; then ${CC} -o compat/gen_zlib_pc "$srcdir"/compat/gen_zlib_pc.c >/dev/null 2>&1 && compat/gen_zlib_pc > compat/zlib.pc && - PKG_CONFIG_PATH="$PKG_CONFIG_PATH":compat && + PKG_CONFIG_PATH=${PKG_CONFIG_PATH:+$PKG_CONFIG_PATH:}compat && export PKG_CONFIG_PATH rm -f compat/gen_zlib_pc fi |