diff options
| author | jlam <jlam@pkgsrc.org> | 2004-11-22 19:54:47 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-11-22 19:54:47 +0000 |
| commit | d745edf381d7c67de8506702f90dd6db7ce1a219 (patch) | |
| tree | dc6dd1a564120810fe84da21b2493402d702f4de /www | |
| parent | 58068ebc1805893eeb487ed206c6b8d56de18046 (diff) | |
| download | pkgsrc-d745edf381d7c67de8506702f90dd6db7ce1a219.tar.gz | |
Fix OpenLDAP detection after devel/apr was converted to use bsd.options.mk.
Diffstat (limited to 'www')
| -rw-r--r-- | www/apache2/Makefile | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/www/apache2/Makefile b/www/apache2/Makefile index d3bb001761e..99ce430c241 100644 --- a/www/apache2/Makefile +++ b/www/apache2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.51 2004/11/22 07:12:53 jlam Exp $ +# $NetBSD: Makefile,v 1.52 2004/11/22 19:54:47 jlam Exp $ PKGNAME= apache-${APACHE_VERSION} PKGREVISION= 2 @@ -34,10 +34,13 @@ DFLT_APACHE_MODULES= all DFLT_APACHE_MODULES+= proxy proxy_connect proxy_ftp proxy_http DFLT_APACHE_MODULES+= ssl -# OpenLDAP support -.if !empty(APR_USE_OPENLDAP:M[Yy][Ee][Ss]) +# LDAP support +.if !defined(_APR_OPTIONS) +_APR_OPTIONS!= cd ../../devel/apr && ${MAKE} show-var VARNAME=PKG_OPTIONS +MAKEFLAGS+= _APR_OPTIONS=${_APR_OPTIONS:Q} +.endif +.if !empty(_APR_OPTIONS:Mldap) DFLT_APACHE_MODULES+= ldap auth_ldap -.include "../../databases/openldap/buildlink3.mk" .endif APACHE_MODULES?= ${DFLT_APACHE_MODULES} @@ -114,6 +117,7 @@ SUBST_MESSAGE.confs= "Fixing configuration files." # _AP_DEPENDS.ssl= ../../security/openssl/buildlink3.mk _AP_DEPENDS.deflate= ../../devel/zlib/buildlink3.mk +_AP_DEPENDS.ldap= ../../databases/openldap/buildlink3.mk _AP_CFG_ARGS.ssl= --with-ssl=${BUILDLINK_PREFIX.openssl} _AP_CFG_ARGS.deflate= --with-z=${BUILDLINK_PREFIX.zlib} |