Skip to content

Avoid hard-coding the name of zlib. #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
BillyONeal wants to merge 1 commit into
base: trunk
Choose a base branch
from
+1 −2
Open

Avoid hard-coding the name of zlib. #10

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions SConstruct
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,7 @@ if aprstatic:
env.Append(CPPDEFINES=['APR_DECLARE_STATIC', 'APU_DECLARE_STATIC'])

# Prepare lists for the pkg-config file
pc_requires = ['libssl', 'libcrypto']
pc_requires = ['libssl', 'libcrypto', 'zlib']
pc_cppflags = []
pc_private_libs = []
win_std_libs = []
Expand Down Expand Up @@ -598,7 +598,6 @@ else:
env.Append(LIBPATH=['$ZLIB/lib'])
if env.subst('$ZLIB') not in ('', '/usr'):
pc_private_libs.append('-L$ZLIB/lib')
pc_private_libs.append('-lz')

# MacOS ships ancient OpenSSL libraries, but no headers, so we can
# assume we're building with an OpenSSL installed outside the
Expand Down