summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan B├╝hler <stbuehler@web.de>2017-10-24 12:29:18 +0200
committerGlenn Strauss <gstrauss@gluelogic.com>2017-10-28 22:41:32 -0400
commitb8989bf2dd0a254c3df706296e51d3fd2f971402 (patch)
tree40a8dc4f400cba1bb43ff980ca5237d21f748a29
parent21dfe350ae474e4b14b178a6575969f9fd747f3b (diff)
downloadlighttpd1.4-b8989bf2dd0a254c3df706296e51d3fd2f971402.tar.gz
lighttpd1.4-b8989bf2dd0a254c3df706296e51d3fd2f971402.zip
[scons] fix some lib dependencies
- mod_cml: doesn't need pcre - mod_trigger_b4_dl: needs gdbm - lighttpd: needs crypto and pcre
-rw-r--r--src/SConscript14
1 files changed, 11 insertions, 3 deletions
diff --git a/src/SConscript b/src/SConscript
index 5c9f9a3f..b9c9537a 100644
--- a/src/SConscript
+++ b/src/SConscript
@@ -141,11 +141,11 @@ if env['with_lua']:
modules['mod_magnet'] = { 'src' : [ 'mod_magnet.c', 'mod_magnet_cache.c' ], 'lib' : [ env['LIBLUA'] ] }
modules['mod_cml'] = {
'src' : [ 'mod_cml_lua.c', 'mod_cml.c', 'mod_cml_funcs.c' ],
- 'lib' : [ env['LIBPCRE'], env['LIBMEMCACHED'], env['LIBLUA'] ]
+ 'lib' : [ env['LIBMEMCACHED'], env['LIBLUA'] ]
}
if env['with_pcre'] and (env['with_memcached'] or env['with_gdbm']):
- modules['mod_trigger_b4_dl'] = { 'src' : [ 'mod_trigger_b4_dl.c' ], 'lib' : [ env['LIBPCRE'], env['LIBMEMCACHED'] ] }
+ modules['mod_trigger_b4_dl'] = { 'src' : [ 'mod_trigger_b4_dl.c' ], 'lib' : [ env['LIBPCRE'], env['LIBMEMCACHED'], env['LIBGDBM'] ] }
if env['with_mysql']:
modules['mod_authn_mysql'] = { 'src' : [ 'mod_authn_mysql.c' ], 'lib' : [ env['LIBCRYPT'], env['LIBMYSQL'] ] }
@@ -269,7 +269,15 @@ else:
else:
bin_linkflags += [ '-Wl,--export-dynamic' ]
-instbin = env.Program(bin_targets, src, LINKFLAGS = bin_linkflags, LIBS = GatherLibs(env, env['LIBS'], common_lib, env['LIBDL']))
+instbin = env.Program(bin_targets, src, LINKFLAGS = bin_linkflags,
+ LIBS = GatherLibs(
+ env,
+ common_lib,
+ env['LIBCRYPTO'],
+ env['LIBDL'],
+ env['LIBPCRE'],
+ )
+)
env.Depends(instbin, configparser)
if env['COMMON_LIB'] == 'bin':