diff options
| -rw-r--r-- | databases/mysql5-client/options.mk | 4 | ||||
| -rw-r--r-- | databases/mysql55-client/options.mk | 11 | ||||
| -rw-r--r-- | databases/mysql56-client/options.mk | 11 |
3 files changed, 5 insertions, 21 deletions
diff --git a/databases/mysql5-client/options.mk b/databases/mysql5-client/options.mk index 75ca383eff9..b29d3fb35d4 100644 --- a/databases/mysql5-client/options.mk +++ b/databases/mysql5-client/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2009/02/11 00:16:41 adrianp Exp $ +# $NetBSD: options.mk,v 1.3 2013/02/18 10:21:06 fhajny Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.mysql5-client @@ -20,6 +20,8 @@ CHECK_BUILTIN.openssl:=no CONFIGURE_ARGS+= --with-openssl=yes CONFIGURE_ARGS+= --with-openssl-libs=/lib CONFIGURE_ARGS+= --with-openssl-includes=/usr/include +. else +CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl} . endif . else CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl} diff --git a/databases/mysql55-client/options.mk b/databases/mysql55-client/options.mk index 5ee144d60fd..d28a63fd295 100644 --- a/databases/mysql55-client/options.mk +++ b/databases/mysql55-client/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2013/02/12 20:36:28 adam Exp $ +# $NetBSD: options.mk,v 1.3 2013/02/18 10:17:19 fhajny Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.mysql5 @@ -11,16 +11,7 @@ PKG_SUGGESTED_OPTIONS+= embedded-server ssl # Enable OpenSSL support .if !empty(PKG_OPTIONS:Mssl) . include "../../security/openssl/buildlink3.mk" -. if ${OPSYS} == "SunOS" -CHECK_BUILTIN.openssl:=yes -. include "../../security/openssl/builtin.mk" -CHECK_BUILTIN.openssl:=no -. if ${USE_BUILTIN.openssl} == "yes" CMAKE_ARGS+= -DWITH_SSL=system -. endif -. else -CMAKE_ARGS+= -DWITH_SSL=system -. endif .else CMAKE_ARGS+= -DWITH_SSL=no .endif diff --git a/databases/mysql56-client/options.mk b/databases/mysql56-client/options.mk index 9078332c73a..6a90ff8c34e 100644 --- a/databases/mysql56-client/options.mk +++ b/databases/mysql56-client/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1 2013/02/13 21:00:03 adam Exp $ +# $NetBSD: options.mk,v 1.2 2013/02/18 10:17:20 fhajny Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.mysql5 @@ -11,16 +11,7 @@ PKG_SUGGESTED_OPTIONS+= embedded-server ssl # Enable OpenSSL support .if !empty(PKG_OPTIONS:Mssl) . include "../../security/openssl/buildlink3.mk" -. if ${OPSYS} == "SunOS" -CHECK_BUILTIN.openssl:=yes -. include "../../security/openssl/builtin.mk" -CHECK_BUILTIN.openssl:=no -. if ${USE_BUILTIN.openssl} == "yes" CMAKE_ARGS+= -DWITH_SSL=system -. endif -. else -CMAKE_ARGS+= -DWITH_SSL=system -. endif .else CMAKE_ARGS+= -DWITH_SSL=no .endif |