[pkgsrc/trunk]: pkgsrc/www/apache2 Fix OpenLDAP detection after devel/apr was...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c7de2c4f621a
branches:  trunk
changeset: 483943:c7de2c4f621a
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Mon Nov 22 19:54:47 2004 +0000

description:
Fix OpenLDAP detection after devel/apr was converted to use bsd.options.mk.

diffstat:

 www/apache2/Makefile |  12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

diffs (34 lines):

diff -r 81027a5698ce -r c7de2c4f621a www/apache2/Makefile
--- a/www/apache2/Makefile      Mon Nov 22 19:52:44 2004 +0000
+++ b/www/apache2/Makefile      Mon Nov 22 19:54:47 2004 +0000
@@ -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+=  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 @@
 #
 _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}