diff options
| author | Tomi Ollila <tomi.ollila@iki.fi> | 2017-03-05 23:03:27 +0200 |
|---|---|---|
| committer | David Bremner <david@tethera.net> | 2017-03-09 10:20:01 -0400 |
| commit | b7763c94e23bbb7d27e995e7a721f31b2ba8cb13 (patch) | |
| tree | 1029cab40e8f5b78cf1257466ad7d6271d915781 /configure | |
| parent | 3071fc04fbf3c43f18291cb8e61b566cdf85d762 (diff) | |
configure: removed $zlib_(cflags|ldflags) from compat code build
When pkg-config does not find configure, a compat version of the
zlib.pc is created. In creation of that configure attempted to
read values of $zlib_cflags and $zlib_ldflags. In the usual case
those were undefined, and with `set -a` now in the beginning of
configure, configure broke.
Even if $zlib_cflags and $zlib_ldflags had values which were used
to create zlib.pc, the values were overwritten (with static content)
a few lines later in next pkg-config --cflags and --libs run. These
values would not be different and probably useless -- the following
boild would probably fail.
But instead of using those, CPATH and LIBRARY_PATH environment
variables can be used successfully (both while configuring and
building).
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -493,8 +493,7 @@ else fi if ! pkg-config --exists zlib; then - ${CC} ${zlib_cflags} -o compat/gen_zlib_pc \ - "$srcdir"/compat/gen_zlib_pc.c ${zlib_ldflags} > /dev/null 2>&1 && + ${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 && export PKG_CONFIG_PATH |