TS-1134: Remove --enable option for NPN. The OpenSSL library either supports NPN or it doesn't. There's no good use case for not using it, so we should just always take it if we can get it.
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/e3d16ef9 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/e3d16ef9 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/e3d16ef9 Branch: refs/heads/master Commit: e3d16ef98578e024f7d47c6da3a413501135f6ea Parents: 6006c51 Author: James Peach <[email protected]> Authored: Wed Feb 29 21:00:07 2012 -0800 Committer: James Peach <[email protected]> Committed: Tue Mar 13 20:15:57 2012 -0700 ---------------------------------------------------------------------- build/crypto.m4 | 19 +++++++------------ 1 files changed, 7 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/e3d16ef9/build/crypto.m4 ---------------------------------------------------------------------- diff --git a/build/crypto.m4 b/build/crypto.m4 index 3cdaae0..5cdc80a 100644 --- a/build/crypto.m4 +++ b/build/crypto.m4 @@ -111,18 +111,13 @@ fi ]) AC_DEFUN([TS_CHECK_CRYPTO_NEXTPROTONEG], [ - AC_ARG_ENABLE([tls-npn], - [AS_HELP_STRING([--enable-tls-npn],[enable NextProtocolNegotiation TLS extension support])], - [ ], - [ - enable_tls_npn=yes - _npn_saved_LIBS=$LIBS - TS_ADDTO(LIBS, [$LIBSSL]) - AC_CHECK_FUNCS(SSL_CTX_set_next_protos_advertised_cb SSL_CTX_set_next_proto_select_cb SSL_select_next_proto SSL_get0_next_proto_negotiated, - [], [enable_tls_npn=no] - ) - LIBS=$_npn_saved_LIBS - ]) + enable_tls_npn=yes + _npn_saved_LIBS=$LIBS + TS_ADDTO(LIBS, [$LIBSSL]) + AC_CHECK_FUNCS(SSL_CTX_set_next_protos_advertised_cb SSL_CTX_set_next_proto_select_cb SSL_select_next_proto SSL_get0_next_proto_negotiated, + [], [enable_tls_npn=no] + ) + LIBS=$_npn_saved_LIBS AC_MSG_CHECKING(whether to enable NextProtocolNegotiation TLS extension support) AC_MSG_RESULT([$enable_tls_npn])
