diff options
| author | Rickard Green <[email protected]> | 2018-08-21 17:52:17 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2018-08-21 17:52:17 +0200 |
| commit | 1b9829f78970547659d73ed5d437f0b66d69c40f (patch) | |
| tree | 1c3f58009669f268ba92339a6c59ce46b4094c1a /otp_build | |
| parent | 1b9aae1a5dd812933543615c3c25bd3321ec4061 (diff) | |
| parent | b3f4e9ee21b1f400b3c26c18c56ebc1ec13b5b4e (diff) | |
| download | otp-1b9829f78970547659d73ed5d437f0b66d69c40f.tar.gz otp-1b9829f78970547659d73ed5d437f0b66d69c40f.tar.bz2 otp-1b9829f78970547659d73ed5d437f0b66d69c40f.zip | |
Merge branch 'rickard/crypto-configure/OTP-15129'
* rickard/crypto-configure/OTP-15129:
Move configuration of crypto to crypto application from erts
Diffstat (limited to 'otp_build')
| -rwxr-xr-x | otp_build | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -214,7 +214,7 @@ NL="\ distribute_config_helpers () { - aclocal_dirs="make ./lib/erl_interface ./lib/odbc ./lib/wx ./lib/megaco" + aclocal_dirs="make ./lib/crypto ./lib/erl_interface ./lib/odbc ./lib/wx ./lib/megaco" autoconf_aux_dirs="./lib/common_test/priv/auxdir ./lib/erl_interface/src/auxdir ./lib/common_test/test_server ./lib/wx/autoconf" aclocal_master="./erts/aclocal.m4" |