Add an options.mk for SSL support

Suggested by pancake@ in PR #28573

4 files changed, 40 insertions, 6 deletions

diff --git a/databases/mysql4-client/Makefile.common b/databases/mysql4-client/Makefile.common
index d67c12cb09f..e5b1a888c1e 100644
--- a/databases/mysql4-client/Makefile.common
+++ b/databases/mysql4-client/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.58 2007/07/04 20:54:35 jlam Exp $
+# $NetBSD: Makefile.common,v 1.59 2007/07/09 22:27:36 adrianp Exp $
 
 DISTNAME=		mysql-4.1.22
 CATEGORIES=		databases
@@ -11,6 +11,7 @@ USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 
 .include "../../mk/bsd.prefs.mk"
+.include "options.mk"
 
 EXTRACT_USING=		pax
 
@@ -62,7 +63,6 @@ CONFIGURE_ARGS+=	--disable-dependency-tracking
 CONFIGURE_ARGS+=	--without-debug
 CONFIGURE_ARGS+=	--without-bench
 CONFIGURE_ARGS+=	--with-low-memory
-CONFIGURE_ARGS+=	--with-openssl=${BUILDLINK_PREFIX.openssl}
 CONFIGURE_ARGS+=	--with-vio
 
 CONFIGURE_ARGS+=	--with-charset=${MYSQL_CHARSET:Q}
@@ -114,5 +114,4 @@ SUBST_SED.scripts=	-e "s,chown,${CHOWN},g" \
 			-e "s,/bin/sh,${RCD_SCRIPTS_SHELL},g"
 SUBST_MESSAGE.scripts=	Fixing scripts.
 
-.include "../../security/openssl/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/databases/mysql4-client/options.mk b/databases/mysql4-client/options.mk
new file mode 100644
index 00000000000..ede4e7ba2c1
--- /dev/null
+++ b/databases/mysql4-client/options.mk
@@ -0,0 +1,18 @@
+# $NetBSD: options.mk,v 1.1 2007/07/09 22:27:35 adrianp Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.mysql4-client
+
+PKG_SUPPORTED_OPTIONS=	ssl
+PKG_SUGGESTED_OPTIONS=	ssl
+
+.include "../../mk/bsd.options.mk"
+
+###
+### Enable OpenSSL support
+###
+.if !empty(PKG_OPTIONS:Mssl)
+.	include "../../security/openssl/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-openssl=${BUILDLINK_PREFIX.openssl}
+.else
+CONFIGURE_ARGS+=	--without-openssl
+.endif
diff --git a/databases/mysql5-client/Makefile.common b/databases/mysql5-client/Makefile.common
index 1466a27fd3d..f4909ac27b6 100644
--- a/databases/mysql5-client/Makefile.common
+++ b/databases/mysql5-client/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.23 2007/07/09 20:01:44 xtraeme Exp $
+# $NetBSD: Makefile.common,v 1.24 2007/07/09 22:34:27 adrianp Exp $
 
 DISTNAME=		mysql-5.0.41
 CATEGORIES=		databases
@@ -11,6 +11,7 @@ USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 
 .include "../../mk/bsd.prefs.mk"
+.include "options.mk"
 
 EXTRACT_USING=		pax
 
@@ -56,7 +57,6 @@ CONFIGURE_ARGS+=	--disable-dependency-tracking
 CONFIGURE_ARGS+=	--without-debug
 CONFIGURE_ARGS+=	--without-bench
 CONFIGURE_ARGS+=	--with-low-memory
-CONFIGURE_ARGS+=	--with-openssl=${BUILDLINK_PREFIX.openssl:Q}
 CONFIGURE_ARGS+=	--with-zlib-dir=${BUILDLINK_PREFIX.zlib:Q}
 CONFIGURE_ARGS+=	--with-vio
 
@@ -122,5 +122,4 @@ SUBST_SED.dylib=	-e "s|\\\$$shrext_cmds|\\.dylib|g"
 pre-configure:
 	cd ${WRKSRC} && autoconf
 
-.include "../../security/openssl/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/databases/mysql5-client/options.mk b/databases/mysql5-client/options.mk
new file mode 100644
index 00000000000..560d9862025
--- /dev/null
+++ b/databases/mysql5-client/options.mk
@@ -0,0 +1,18 @@
+# $NetBSD: options.mk,v 1.1 2007/07/09 22:34:27 adrianp Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.mysql5-client
+
+PKG_SUPPORTED_OPTIONS=	ssl
+PKG_SUGGESTED_OPTIONS=	ssl
+
+.include "../../mk/bsd.options.mk"
+
+###
+### Enable OpenSSL support
+###
+.if !empty(PKG_OPTIONS:Mssl)
+.	include "../../security/openssl/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-openssl=${BUILDLINK_PREFIX.openssl}
+.else
+CONFIGURE_ARGS+=	--without-openssl
+.endif