configure: don't enable tls protocols if network is disabled

Message ID 1433189641-4280-1-git-send-email-jamrial@gmail.com
State New
Headers show

Commit Message

James Almer June 1, 2015, 8:14 p.m.
This was a regression introduced with d8ffb2055f0e0fcb5d025bab72eb19c2a886c125.

Signed-off-by: James Almer <jamrial@gmail.com>
---
 configure | 2 ++
 1 file changed, 2 insertions(+)

Comments

Martin Storsjö June 2, 2015, 7:32 a.m. | #1
On Mon, 1 Jun 2015, James Almer wrote:

> This was a regression introduced with d8ffb2055f0e0fcb5d025bab72eb19c2a886c125.
>
> Signed-off-by: James Almer <jamrial@gmail.com>
> ---
> configure | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/configure b/configure
> index cdc5a8d..a29cd38 100755
> --- a/configure
> +++ b/configure
> @@ -2216,6 +2216,8 @@ srtp_protocol_select="rtp_protocol"
> tcp_protocol_select="network"
> tls_gnutls_protocol_deps="gnutls"
> tls_openssl_protocol_deps="openssl !tls_gnutls_protocol"
> +tls_gnutls_protocol_select="tcp_protocol"
> +tls_openssl_protocol_select="tcp_protocol"
> tls_protocol_deps_any="tls_gnutls_protocol tls_openssl_protocol"
> tls_protocol_select="tcp_protocol"
> udp_protocol_select="network"
> -- 
> 2.4.1

Looks good, although the tls_protocol_select line should probably also be 
removed?

// Martin
Vittorio Giovara June 2, 2015, 9:54 a.m. | #2
On Mon, Jun 1, 2015 at 9:14 PM, James Almer <jamrial@gmail.com> wrote:
> This was a regression introduced with d8ffb2055f0e0fcb5d025bab72eb19c2a886c125.
>
> Signed-off-by: James Almer <jamrial@gmail.com>
> ---
>  configure | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/configure b/configure
> index cdc5a8d..a29cd38 100755
> --- a/configure
> +++ b/configure
> @@ -2216,6 +2216,8 @@ srtp_protocol_select="rtp_protocol"
>  tcp_protocol_select="network"
>  tls_gnutls_protocol_deps="gnutls"
>  tls_openssl_protocol_deps="openssl !tls_gnutls_protocol"
> +tls_gnutls_protocol_select="tcp_protocol"
> +tls_openssl_protocol_select="tcp_protocol"
>  tls_protocol_deps_any="tls_gnutls_protocol tls_openssl_protocol"
>  tls_protocol_select="tcp_protocol"
>  udp_protocol_select="network"

Seems ok, whoever pushes this could please take care of the order?

Patch

diff --git a/configure b/configure
index cdc5a8d..a29cd38 100755
--- a/configure
+++ b/configure
@@ -2216,6 +2216,8 @@  srtp_protocol_select="rtp_protocol"
 tcp_protocol_select="network"
 tls_gnutls_protocol_deps="gnutls"
 tls_openssl_protocol_deps="openssl !tls_gnutls_protocol"
+tls_gnutls_protocol_select="tcp_protocol"
+tls_openssl_protocol_select="tcp_protocol"
 tls_protocol_deps_any="tls_gnutls_protocol tls_openssl_protocol"
 tls_protocol_select="tcp_protocol"
 udp_protocol_select="network"