aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorIngela Anderton Andin <ingela@erlang.org>2011-10-06 11:53:52 +0200
committerIngela Anderton Andin <ingela@erlang.org>2011-10-06 11:53:52 +0200
commit00202339445daae6ed931f28f932089d5c3dd455 (patch)
treec08c4bb7b615ccb1b3325ce7ad65179a5f15be2a /erts
parent811e0de29d02031acb0771e1fa74d8f4f97574a6 (diff)
parent64a3651b3ece1a1e3195f20e37247f929d179f61 (diff)
downloadotp-00202339445daae6ed931f28f932089d5c3dd455.tar.gz
otp-00202339445daae6ed931f28f932089d5c3dd455.tar.bz2
otp-00202339445daae6ed931f28f932089d5c3dd455.zip
Merge branch 'ia/ssl/remove-old-ssl/OTP-7048'
* ia/ssl/remove-old-ssl/OTP-7048: Remove old ssl implementation and deprecated function ssl:peercert/1 Conflicts: lib/ssl/test/Makefile
Diffstat (limited to 'erts')
-rw-r--r--erts/configure.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/configure.in b/erts/configure.in
index 450c4d7a83..ea76a2f400 100644
--- a/erts/configure.in
+++ b/erts/configure.in
@@ -4325,7 +4325,7 @@ dnl The ones below should be moved to their respective lib
dnl
../lib/ic/c_src/$host/Makefile:../lib/ic/c_src/Makefile.in
../lib/os_mon/c_src/$host/Makefile:../lib/os_mon/c_src/Makefile.in
- ../lib/ssl/c_src/$host/Makefile:../lib/ssl/c_src/Makefile.in
+dnl ../lib/ssl/c_src/$host/Makefile:../lib/ssl/c_src/Makefile.in
../lib/crypto/c_src/$host/Makefile:../lib/crypto/c_src/Makefile.in
../lib/orber/c_src/$host/Makefile:../lib/orber/c_src/Makefile.in
../lib/runtime_tools/c_src/$host/Makefile:../lib/runtime_tools/c_src/Makefile.in