Browse Source

[build] fix SCons build when building all TLS mods

master
Glenn Strauss 1 year ago
parent
commit
ce1d45ed82
  1. 13
      SConstruct
  2. 6
      src/SConscript

13
SConstruct

@ -339,6 +339,9 @@ if 1:
LIBLBER = '',
LIBLDAP = '',
LIBLUA = '',
LIBMBEDTLS = '',
LIBMBEDX509 = '',
LIBMBEDCRYPTO = '',
LIBMEMCACHED = '',
LIBMYSQL = '',
LIBNSS = '',
@ -348,7 +351,9 @@ if 1:
LIBSASL = '',
LIBSQLITE3 = '',
LIBSSL = '',
LIBSSLCRYPTO = '',
LIBUUID = '',
LIBWOLFSSL = '',
LIBX509 = '',
LIBXML2 = '',
LIBXXHASH = '',
@ -615,6 +620,7 @@ if 1:
autoconf.env.Append(
CPPFLAGS = [ '-DHAVE_OPENSSL_SSL_H', '-DHAVE_LIBSSL'],
LIBSSL = 'ssl',
LIBSSLCRYPTO = 'crypto',
LIBCRYPTO = 'crypto',
)
@ -629,7 +635,7 @@ if 1:
fail("Couldn't find wolfssl")
autoconf.env.Append(
CPPFLAGS = [ '-DHAVE_WOLFSSL_SSL_H' ],
LIBSSL = '',
LIBWOLFSSL= 'wolfssl',
LIBCRYPTO = 'wolfssl',
)
@ -638,8 +644,9 @@ if 1:
fail("Couldn't find mbedtls")
autoconf.env.Append(
CPPFLAGS = [ '-DHAVE_LIBMBEDCRYPTO' ],
LIBSSL = 'mbedtls',
LIBX509 = 'mbedx509',
LIBMBEDTLS = 'mbedtls',
LIBMBEDX509 = 'mbedx509',
LIBMBEDCRYPTO = 'mbedcrypto',
LIBCRYPTO = 'mbedcrypto',
)

6
src/SConscript

@ -175,13 +175,13 @@ if env['with_sasl']:
modules['mod_authn_sasl'] = { 'src' : [ 'mod_authn_sasl.c' ], 'lib' : [ env['LIBSASL'] ] }
if env['with_openssl']:
modules['mod_openssl'] = { 'src' : [ 'mod_openssl.c' ], 'lib' : [ env['LIBSSL'], env['LIBCRYPTO'] ] }
modules['mod_openssl'] = { 'src' : [ 'mod_openssl.c' ], 'lib' : [ env['LIBSSL'], env['LIBSSLCRYPTO'] ] }
if env['with_wolfssl']:
modules['mod_wolfssl'] = { 'src' : [ 'mod_wolfssl.c' ], 'lib' : [ env['LIBCRYPTO'], 'm' ] }
modules['mod_wolfssl'] = { 'src' : [ 'mod_wolfssl.c' ], 'lib' : [ env['LIBWOLFSSL'], 'm' ] }
if env['with_mbedtls']:
modules['mod_mbedtls'] = { 'src' : [ 'mod_mbedtls.c' ], 'lib' : [ env['LIBSSL'], env['LIBX509'], env['LIBCRYPTO'] ] }
modules['mod_mbedtls'] = { 'src' : [ 'mod_mbedtls.c' ], 'lib' : [ env['LIBMBEDTLS'], env['LIBMBEDX509'], env['LIBMBEDCRYPTO'] ] }
if env['with_nss']:
modules['mod_nss'] = { 'src' : [ 'mod_nss.c' ], 'lib' : [ env['LIBNSS'] ] }

Loading…
Cancel
Save