From f358f04bdcde67e3e0077ba4d6dc7d8d469aea1d Mon Sep 17 00:00:00 2001 From: Glenn Strauss Date: Sun, 2 Aug 2020 12:31:23 -0400 Subject: [PATCH] [build] SCons build mod_deflate w/ libm for brotli --- SConstruct | 3 +-- src/SConscript | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/SConstruct b/SConstruct index 2184fc9f..7ea178fd 100644 --- a/SConstruct +++ b/SConstruct @@ -280,7 +280,7 @@ env = Environment( env.Help(vars.GenerateHelpText(env)) -if env.subst('${CC}') is not '': +if env.subst('${CC}') != '': env['CC'] = env.subst('${CC}') env['package'] = package @@ -507,7 +507,6 @@ if 1: fail("Couldn't find libbrotlienc") autoconf.env.Append( CPPFLAGS = [ '-DHAVE_BROTLI_ENCODE_H', '-DHAVE_BROTLI' ], - LIBS = [ 'm' ], ) if env['with_dbi']: diff --git a/src/SConscript b/src/SConscript index 629e66a9..d18a84b3 100644 --- a/src/SConscript +++ b/src/SConscript @@ -103,7 +103,7 @@ modules = { 'mod_auth' : { 'src' : [ 'mod_auth.c' ], 'lib' : [ env['LIBCRYPTO'] ] }, 'mod_authn_file' : { 'src' : [ 'mod_authn_file.c' ], 'lib' : [ env['LIBCRYPT'], env['LIBCRYPTO'] ] }, 'mod_cgi' : { 'src' : [ 'mod_cgi.c' ] }, - 'mod_deflate' : { 'src' : [ 'mod_deflate.c' ], 'lib' : [ env['LIBZ'], env['LIBBZ2'], env['LIBBROTLI'] ] }, + 'mod_deflate' : { 'src' : [ 'mod_deflate.c' ], 'lib' : [ env['LIBZ'], env['LIBBZ2'], env['LIBBROTLI'], 'm' ] }, 'mod_dirlisting' : { 'src' : [ 'mod_dirlisting.c' ], 'lib' : [ env['LIBPCRE'] ] }, 'mod_evasive' : { 'src' : [ 'mod_evasive.c' ] }, 'mod_evhost' : { 'src' : [ 'mod_evhost.c' ] },