diff options
| author | tv <tv> | 2005-10-19 18:05:06 +0000 |
|---|---|---|
| committer | tv <tv> | 2005-10-19 18:05:06 +0000 |
| commit | f13d180ef0456d800bb1a69f93e0ebb0d355a871 (patch) | |
| tree | e1d3be799e67a9f2fb6ac78d9aef7014fed55fda /www | |
| parent | 6dcf4d2b48813e45700a9364383fb98179b59d4b (diff) | |
| download | pkgsrc-f13d180ef0456d800bb1a69f93e0ebb0d355a871.tar.gz | |
Bring back the "ssl" option so that the builder may have the *option* to
turn it off. It's still on by default (in PKG_SUGGESTED_OPTIONS), so
no PKGREVISION bump required.
Diffstat (limited to 'www')
| -rw-r--r-- | www/php4/Makefile.php | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/www/php4/Makefile.php b/www/php4/Makefile.php index 2abe76155e6..e627fd1118d 100644 --- a/www/php4/Makefile.php +++ b/www/php4/Makefile.php @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.php,v 1.27 2005/10/16 12:06:05 jdolecek Exp $ +# $NetBSD: Makefile.php,v 1.28 2005/10/19 18:05:06 tv Exp $ .include "../../www/php4/Makefile.common" @@ -31,9 +31,6 @@ CONFIGURE_ARGS+= --with-regex=php CONFIGURE_ARGS+= --enable-memory-limit CONFIGURE_ARGS+= --enable-track-vars -CONFIGURE_ARGS+= --with-openssl -.include "../../security/openssl/buildlink3.mk" - # Support for linking some PHP4 extensions statically into the php CGI and # into the apache mod_php.so DSO. # @@ -52,7 +49,8 @@ CONFIGURE_ENV+= ac_cv_lib_pam_pam_start=no CONFIGURE_ENV+= EXTENSION_DIR="${PREFIX}/${PHP_EXTENSION_DIR}" PKG_OPTIONS_VAR= PKG_OPTIONS.${PKGNAME:C/-[^-]*$//} -PKG_SUPPORTED_OPTIONS+= inet6 +PKG_SUPPORTED_OPTIONS+= inet6 ssl +PKG_SUGGESTED_OPTIONS+= ssl .include "../../mk/bsd.options.mk" @@ -61,3 +59,10 @@ CONFIGURE_ARGS+= --enable-ipv6 .else CONFIGURE_ARGS+= --disable-ipv6 .endif + +.if !empty(PKG_OPTIONS:Mssl) +. include "../../security/openssl/buildlink3.mk" +CONFIGURE_ARGS+= --with-openssl +.else +CONFIGURE_ARGS+= --without-openssl +.endif |