diff options
| author | obache <obache> | 2015-01-19 11:15:37 +0000 |
|---|---|---|
| committer | obache <obache> | 2015-01-19 11:15:37 +0000 |
| commit | d7694152a553f44bc828fdb2635dc6dc9fc6e443 (patch) | |
| tree | f42bbef2a3b104bf7e1ebb44f8cce474704d62c8 /net | |
| parent | 81f2fa835c43b53ff4fe30ed19da3caca8e7284b (diff) | |
| download | pkgsrc-d7694152a553f44bc828fdb2635dc6dc9fc6e443.tar.gz | |
fixes broken "ssl" configure option behavior.
Diffstat (limited to 'net')
| -rwxr-xr-x | net/tnftp/files/configure | 4 | ||||
| -rw-r--r-- | net/tnftp/files/configure.ac | 8 | ||||
| -rw-r--r-- | net/tnftp/options.mk | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/net/tnftp/files/configure b/net/tnftp/files/configure index f518841d6aa..ef0baa3a0da 100755 --- a/net/tnftp/files/configure +++ b/net/tnftp/files/configure @@ -3150,9 +3150,9 @@ fi # Check whether --enable-ssl was given. if test "${enable_ssl+set}" = set; then : - enableval=$enable_ssl; opt_ssl=$enableval + enableval=$enable_ssl; with_ssl=$enableval else - opt_ssl=auto + with_ssl=auto fi diff --git a/net/tnftp/files/configure.ac b/net/tnftp/files/configure.ac index eaa31134ffa..430fd98affc 100644 --- a/net/tnftp/files/configure.ac +++ b/net/tnftp/files/configure.ac @@ -1,4 +1,4 @@ -# $NetBSD: configure.ac,v 1.4 2014/11/04 22:38:26 agc Exp $ +# $NetBSD: configure.ac,v 1.5 2015/01/19 11:15:37 obache Exp $ # # Process this file with autoconf to produce a configure script. @@ -9,7 +9,7 @@ AC_COPYRIGHT([ Copyright (c) 1999-2014 The NetBSD Foundation, Inc. All rights reserved. ]) -AC_REVISION([$Revision: 1.4 $]) +AC_REVISION([$Revision: 1.5 $]) AS_SHELL_SANITIZE() @@ -41,8 +41,8 @@ AC_ARG_ENABLE([ssl], [AS_HELP_STRING([--enable-ssl], [enable SSL support (requires --with-openssl) [default=auto]])], - [opt_ssl=$enableval], - [opt_ssl=auto]) + [with_ssl=$enableval], + [with_ssl=auto]) AC_ARG_WITH([socks], [AS_HELP_STRING([--with-socks], [enable support for (Dante) SOCKS5 proxy diff --git a/net/tnftp/options.mk b/net/tnftp/options.mk index bfcdcc7efae..1e592b6cf16 100644 --- a/net/tnftp/options.mk +++ b/net/tnftp/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.7 2014/12/21 09:11:40 obache Exp $ +# $NetBSD: options.mk,v 1.8 2015/01/19 11:15:37 obache Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.tnftp PKG_SUPPORTED_OPTIONS= inet6 ssl @@ -30,9 +30,9 @@ CONFIGURE_ARGS+= --disable-ipv6 .endif .if !empty(PKG_OPTIONS:Mssl) -CONFIGURE_ARGS+= --with-ssl=yes +CONFIGURE_ARGS+= --enable-ssl .include "../../security/openssl/buildlink3.mk" CONFIGURE_ARGS+= --with-openssl=${SSLBASE} .else -CONFIGURE_ARGS+= --with-ssl=no +CONFIGURE_ARGS+= --disable-ssl .endif |